Migrate the rest of android_libraries to generate their on R.java

These should be the only remaining instances of R.java generated by an
android_resources target instead of the android_library target (in
src/ there are others in other repos).

TBR=What should just be a mechanical change.

Bug: 1073476
Change-Id: Ia61ff2985a7db20f11a546bb76194bd796aec00e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2357636
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798851}

android_webview/BUILD.gn

@@ -585,6 +585,8 @@ android_library("browser_java") {
     "//android_webview/browser:browser_enums",
     "//components/safe_browsing/core/db:sb_threat_values",
   ]
+
+  resources_package = "org.chromium.android_webview"
 }
 
 android_library("common_variations_java") {
@@ -880,7 +882,7 @@ android_resources("resources") {
     "java/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png",
     "java/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png",
   ]
-  custom_package = "org.chromium.android_webview"
+  create_srcjar = false
   deps = [ ":strings_grd" ]
 }
 

android_webview/nonembedded/BUILD.gn

@@ -74,6 +74,7 @@ android_library("devui_java") {
     "//third_party/android_deps:androidx_savedstate_savedstate_java",
     "//ui/android:ui_java",
   ]
+  resources_package = "org.chromium.android_webview.devui"
 }
 
 android_library("services_java") {
@@ -127,7 +128,7 @@ android_resources("icon_resources") {
     "java/res_icon/drawable-xhdpi/icon_webview.png",
     "java/res_icon/drawable-xxhdpi/icon_webview.png",
   ]
-  custom_package = "org.chromium.android_webview.icon"
+  create_srcjar = false
 }
 
 android_resources("devui_resources") {
@@ -158,19 +159,19 @@ android_resources("devui_resources") {
     "java/res_devui/values/strings.xml",
     "java/res_devui/values/styles.xml",
   ]
-  custom_package = "org.chromium.android_webview.devui"
+  create_srcjar = false
 }
 
 android_resources("devui_launcher_icon_resources") {
   sources = []
-  custom_package = "org.chromium.android_webview.devui.icon"
+  create_srcjar = false
   android_manifest = "java/DeveloperUiLauncherManifest.xml"
 }
 
 android_resources("monochrome_devui_launcher_icon_resources") {
   sources = []
   android_manifest = "java/MonochromeDeveloperUiLauncherManifest.xml"
-  custom_package = "org.chromium.android_webview.devui.icon"
+  create_srcjar = false
 }
 
 _webview_jinja_variables = [ "manifest_package=$system_webview_package_name" ] +

android_webview/test/BUILD.gn

@@ -101,7 +101,7 @@ android_resources("webview_instrumentation_apk_resources") {
     "shell/res/raw/resource_icon.png",
     "shell/res/values/config.xml",
   ]
-  custom_package = "org.chromium.android_webview.shell"
+  create_srcjar = false
 }
 
 android_assets("webview_instrumentation_apk_assets") {

android_webview/tools/automated_ui_tests/BUILD.gn

@@ -37,7 +37,7 @@ android_resources("webview_ui_test_app_apk_resources") {
     "java/res/layout/fullscreen_webview.xml",
     "java/res/values/strings.xml",
   ]
-  custom_package = "org.chromium.webview_ui_test"
+  create_srcjar = false
 }
 
 instrumentation_test_apk("webview_ui_test_app_test_apk") {

android_webview/tools/system_webview_shell/BUILD.gn

@@ -85,7 +85,7 @@ android_resources("system_webview_shell_apk_resources") {
     "apk/res/values/styles.xml",
     "apk/res/xml/network_security_config.xml",
   ]
-  custom_package = "org.chromium.webview_shell"
+  create_srcjar = false
   deps = [ "//third_party/android_deps:android_support_v7_appcompat_java" ]
 }
 

chrome/android/feed/BUILD.gn

@@ -37,6 +37,6 @@ if (enable_feed_in_chrome) {
       "//chrome/android:chrome_app_java_resources",
       "//ui/android:ui_java_resources",
     ]
-    custom_package = "org.chromium.chrome.feed"
+    create_srcjar = false
   }
 }

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/BUILD.gn

@@ -11,5 +11,5 @@ android_resources("piet_resources") {
     "piet/res/drawable-v21/piet_clickable_ripple.xml",
     "piet/res/values/styles.xml",
   ]
-  custom_package = "org.chromium.chrome.browser.feed.library.piet"
+  create_srcjar = false
 }

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/BasicStreamTest.java

@@ -94,7 +94,7 @@
 import org.chromium.chrome.browser.feed.shared.stream.Header;
 import org.chromium.chrome.browser.feed.shared.stream.Stream.ContentChangedListener;
 import org.chromium.chrome.browser.feed.shared.stream.Stream.ScrollListener;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.components.feed.core.proto.libraries.api.internal.StreamDataProto.UiContext;
 import org.chromium.components.feed.core.proto.libraries.basicstream.internal.StreamSavedInstanceStateProto.StreamSavedInstanceState;
 import org.chromium.components.feed.core.proto.libraries.sharedstream.ScrollStateProto.ScrollState;

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamRecyclerViewAdapterTest.java

@@ -60,7 +60,7 @@
 import org.chromium.chrome.browser.feed.library.sharedstream.publicapi.scroll.ScrollObservable;
 import org.chromium.chrome.browser.feed.shared.stream.Header;
 import org.chromium.chrome.browser.feed.shared.stream.Stream.ContentChangedListener;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 import java.util.Collections;

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ContinuationViewHolderTest.java

@@ -28,7 +28,7 @@
 import org.chromium.chrome.browser.feed.library.sharedstream.logging.LoggingListener;
 import org.chromium.chrome.browser.feed.library.sharedstream.logging.VisibilityMonitor;
 import org.chromium.chrome.browser.feed.library.testing.host.stream.FakeCardConfiguration;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link ContinuationViewHolder}. */

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/NoContentViewHolderTest.java

@@ -25,7 +25,7 @@
 import org.robolectric.annotation.Config;
 
 import org.chromium.chrome.browser.feed.library.api.host.stream.CardConfiguration;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link NoContentViewHolder}. */

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/PietViewHolderTest.java

@@ -53,7 +53,7 @@
 import org.chromium.chrome.browser.feed.library.sharedstream.logging.VisibilityMonitor;
 import org.chromium.chrome.browser.feed.library.sharedstream.piet.PietEventLogger;
 import org.chromium.chrome.browser.feed.library.testing.host.stream.FakeCardConfiguration;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.components.feed.core.proto.ui.action.FeedActionPayloadProto.FeedActionPayload;
 import org.chromium.components.feed.core.proto.ui.action.FeedActionProto.FeedAction;
 import org.chromium.components.feed.core.proto.ui.piet.ActionsProto.Action;

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ZeroStateViewHolderTest.java

@@ -25,7 +25,7 @@
 
 import org.chromium.chrome.browser.feed.library.api.host.stream.CardConfiguration;
 import org.chromium.chrome.browser.feed.library.testing.host.stream.FakeCardConfiguration;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link ZeroStateViewHolder}. */

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java

@@ -33,7 +33,7 @@
 import org.chromium.chrome.browser.feed.library.sharedstream.contextmenumanager.ContextMenuManager.ContextMenuClickHandler;
 import org.chromium.chrome.browser.feed.library.sharedstream.publicapi.menumeasurer.MenuMeasurer;
 import org.chromium.chrome.browser.feed.library.sharedstream.publicapi.menumeasurer.Size;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 import java.util.ArrayList;

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java

@@ -30,7 +30,7 @@
 import org.robolectric.shadows.ShadowAlertDialog;
 
 import org.chromium.chrome.browser.feed.library.sharedstream.contextmenumanager.ContextMenuManager.ContextMenuClickHandler;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link ContextMenuManagerImpl}. */

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/publicapi/menumeasurer/MenuMeasurerTest.java

@@ -19,7 +19,7 @@
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link MenuMeasurer}. */

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/network_fetch/FeedNewTabPageCardInstrumentationTest.java

@@ -20,7 +20,7 @@
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
 import org.chromium.chrome.test.util.NewTabPageTestUtils;

chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/shared/ui/MaterialSpinnerViewTest.java

@@ -17,7 +17,7 @@
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
-import org.chromium.chrome.feed.R;
+import org.chromium.chrome.R;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Tests for {@link MaterialSpinnerView}. */

chrome/browser/privacy/BUILD.gn

@@ -38,10 +38,10 @@ android_library("java") {
     "//net/dns:secure_dns_mode_generated_enum",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  resources_package = "org.chromium.chrome.browser.privacy.secure_dns"
 }
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.chrome.browser.privacy.secure_dns"
   sources = [
     "java/res/layout/secure_dns_provider_preference.xml",
     "java/res/layout/secure_dns_provider_spinner_item.xml",
@@ -54,6 +54,7 @@ android_resources("java_resources") {
     "//components/browser_ui/widget/android:java_resources",
     "//third_party/android_deps:material_design_java",
   ]
+  create_srcjar = false
 }
 
 generate_jni("jni_headers") {

components/BUILD.gn

@@ -520,6 +520,7 @@ if (is_android) {
       "test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java",
       "test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java",
     ]
+    resources_package = "org.chromium.components_browsertests_apk"
   }
 
   jinja_template("components_browsertests_manifest") {
@@ -535,7 +536,7 @@ if (is_android) {
     sources = [
       "//components/test/android/browsertests_apk/res/layout/test_activity.xml",
     ]
-    custom_package = "org.chromium.components_browsertests_apk"
+    create_srcjar = false
   }
 }
 

components/autofill/android/BUILD.gn

@@ -14,7 +14,7 @@ java_strings_grd("autofill_strings_grd") {
 }
 
 android_resources("autofill_java_resources") {
-  custom_package = "org.chromium.components.autofill"
+  create_srcjar = false
   sources = [
     "java/res/layout/autofill_dropdown_footer_item_refresh.xml",
     "java/res/layout/autofill_dropdown_item.xml",
@@ -55,4 +55,5 @@ android_library("autofill_java") {
     "java/src/org/chromium/components/autofill/EditableOption.java",
   ]
   srcjar_deps = [ ":autofill_core_browser_java_enums" ]
+  resources_package = "org.chromium.components.autofill"
 }

components/blocked_content/android/BUILD.gn

@@ -12,5 +12,5 @@ android_resources("java_resources") {
     "res/drawable-xxhdpi/infobar_blocked_popups.png",
     "res/drawable-xxxhdpi/infobar_blocked_popups.png",
   ]
-  custom_package = "org.chromium.components.blocked_content"
+  create_srcjar = false
 }

components/browser_ui/android/bottomsheet/BUILD.gn

@@ -21,16 +21,17 @@ android_library("java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
+  resources_package = "org.chromium.components.browser_ui.bottomsheet"
 }
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.components.browser_ui.bottomsheet"
   sources = [
     "java/res/layout/bottom_sheet.xml",
     "java/res/values/dimens.xml",
   ]
 
   deps = [ "//components/browser_ui/strings/android:browser_ui_strings_grd" ]
+  create_srcjar = false
 }
 
 # The only dependent on this code outside of this component should be glue.

components/browser_ui/android/bottomsheet/internal/BUILD.gn

@@ -24,10 +24,12 @@ android_library("java") {
     "..:java_resources",
     "..:manager_java",
     "//base:base_java",
+    "//components/browser_ui/styles/android:java_resources",
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
+  resources_package = "org.chromium.components.browser_ui.bottomsheet.internal"
 }
 
 android_library("junit_tests") {

components/browser_ui/android/bottomsheet/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheet.java

@@ -28,6 +28,7 @@
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent.HeightMode;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.SheetState;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.StateChangeReason;
+import org.chromium.components.browser_ui.bottomsheet.internal.R;
 import org.chromium.ui.KeyboardVisibilityDelegate;
 import org.chromium.ui.util.AccessibilityUtil;
 
@@ -282,8 +283,7 @@ public void init(Window window, KeyboardVisibilityDelegate keyboardDelegate) {
 
         mToolbarHolder =
                 (TouchRestrictingFrameLayout) findViewById(R.id.bottom_sheet_toolbar_container);
-        mToolbarHolder.setBackgroundResource(
-                org.chromium.components.browser_ui.styles.R.drawable.top_round);
+        mToolbarHolder.setBackgroundResource(R.drawable.top_round);
 
         mDefaultToolbarView = mToolbarHolder.findViewById(R.id.bottom_sheet_toolbar);
 
@@ -292,8 +292,7 @@ public void init(Window window, KeyboardVisibilityDelegate keyboardDelegate) {
         mBottomSheetContentContainer =
                 (TouchRestrictingFrameLayout) findViewById(R.id.bottom_sheet_content);
         mBottomSheetContentContainer.setBottomSheet(this);
-        mBottomSheetContentContainer.setBackgroundResource(
-                org.chromium.components.browser_ui.styles.R.drawable.top_round);
+        mBottomSheetContentContainer.setBackgroundResource(R.drawable.top_round);
 
         mContainerWidth = root.getWidth();
         mContainerHeight = root.getHeight();
@@ -937,9 +936,7 @@ private void setInternalCurrentState(@SheetState int state, @StateChangeReason i
 
             if (getCurrentSheetContent().swipeToDismissEnabled()) {
                 contentDescription += ". "
-                        + getResources().getString(
-                                org.chromium.components.browser_ui.widget.R.string
-                                        .bottom_sheet_accessibility_description);
+                        + getResources().getString(R.string.bottom_sheet_accessibility_description);
             }
 
             setContentDescription(contentDescription);

components/browser_ui/client_certificate/android/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.components.browser_ui.client_certificate"
+  create_srcjar = false
   deps = [
     "//components/browser_ui/strings/android:browser_ui_strings_grd",
     "//components/browser_ui/styles/android:java_resources",
@@ -28,6 +28,7 @@ android_library("java") {
     "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  resources_package = "org.chromium.components.browser_ui.client_certificate"
 }
 
 source_set("android") {

components/browser_ui/http_auth/android/BUILD.gn

@@ -18,10 +18,11 @@ android_library("java") {
     "//third_party/android_deps:material_design_java",
     "//ui/android:ui_java",
   ]
+  resources_package = "org.chromium.components.browser_ui.http_auth"
 }
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.components.browser_ui.http_auth"
+  create_srcjar = false
   sources = [ "java/res/layout/http_auth_dialog.xml" ]
 
   deps = [

components/browser_ui/media/android/BUILD.gn

@@ -30,10 +30,11 @@ android_library("java") {
     "//ui/android:ui_full_java",
     "//url:gurl_java",
   ]
+  resources_package = "org.chromium.components.browser_ui.media"
 }
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.components.browser_ui.media"
+  create_srcjar = false
   sources = [
     "java/res/drawable-hdpi/audio_playing.png",
     "java/res/drawable-hdpi/audio_playing_square.png",

components/browser_ui/modaldialog/android/BUILD.gn

@@ -21,10 +21,11 @@ android_library("java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
+  resources_package = "org.chromium.components.browser_ui.modaldialog"
 }
 
 android_resources("java_resources") {
-  custom_package = "org.chromium.components.browser_ui.modaldialog"
+  create_srcjar = false
   sources = [
     "java/res/layout/modal_dialog_container.xml",
     "java/res/layout/modal_dialog_title.xml",
@@ -67,12 +68,13 @@ android_library("javatests") {
     "//ui/android:ui_java",
     "//ui/android:ui_java_test_support",
   ]
+  resources_package = "org.chromium.components.browser_ui.modaldialog.test"
 }
 
 android_resources("java_test_resources") {
   testonly = true
 
-  custom_package = "org.chromium.components.browser_ui.modaldialog.test"
+  create_srcjar = false
   sources = [
     "test/java/res/drawable/ic_add.xml",
     "test/java/res/values/ids.xml",