Change chrome/ R.java generation to be at the android_library level
This changes android_resources targets under chrome/ to no longer generate and
R.java but instead generate the R.java in the android_library targets
themselves. Additionally adds a resources package to base_java and fixes
errorprone warning about R class shadowing.
Bug: 1073476
Change-Id: I9654b72939bbecd5cd0c014834a663c5b96dbdd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297808
Reviewed-by: Andrew Grieve <[email protected]>
Commit-Queue: Andrew Grieve <[email protected]>
Commit-Queue: Mohamed Heikal <[email protected]>
Cr-Commit-Position: refs/heads/master@{#790655}
diff --git a/chrome/browser/ui/android/appmenu/BUILD.gn b/chrome/browser/ui/android/appmenu/BUILD.gn
index 5aa15ac..9baf59a 100644
--- a/chrome/browser/ui/android/appmenu/BUILD.gn
+++ b/chrome/browser/ui/android/appmenu/BUILD.gn
@@ -21,6 +21,7 @@
"//chrome/browser/android/lifecycle:java",
"//third_party/android_deps:androidx_annotation_annotation_java",
]
+ resources_package = "org.chromium.chrome.browser.ui.appmenu"
}
android_library_factory("factory_java") {
@@ -36,10 +37,10 @@
}
android_resources("java_resources") {
- custom_package = "org.chromium.chrome.browser.ui.appmenu"
sources = [ "java/res/values/styles.xml" ]
deps = [
"//components/browser_ui/styles/android:java_resources",
"//ui/android:ui_java_resources",
]
+ create_srcjar = false
}
