Android: Preventing duplicate resource package names
It was possible that a target could depend on two identically named targets, for
example "foo/bar:resources" and "bar/baz:resources", and these two "resources"
packages would collide. We are preventing this by using the entire directory and
not just the basename.
Bug: 671648
Change-Id: I1f83655908fdd8b16bf024ab6db797a9dfe4beb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1627891
Commit-Queue: Sam Maier <[email protected]>
Auto-Submit: Sam Maier <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#663278}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 19933cdbe5cae51d150fccb62883774edb543b51
diff --git a/android/gyp/prepare_resources.py b/android/gyp/prepare_resources.py
index bf386ec..deb895b 100755
--- a/android/gyp/prepare_resources.py
+++ b/android/gyp/prepare_resources.py
@@ -249,8 +249,7 @@
resource_utils.CreateRJavaFiles(
build.srcjar_dir, package, r_txt_path, options.extra_res_packages,
- options.extra_r_text_files, rjava_build_options,
- os.path.basename(options.srcjar_out))
+ options.extra_r_text_files, rjava_build_options, options.srcjar_out)
build_utils.ZipDir(options.srcjar_out, build.srcjar_dir)
