Android: Add direct deps for components

Remove //components* from allowlist.

Bug: 1082904
Change-Id: Icf4100c9e9e2a4ea7c843ea6d8cfa148b1fa7b6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314298
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790994}

build/config/android/internal_rules.gni

@@ -3097,7 +3097,7 @@ if (enable_java_templates) {
           filter_exclude(
               [ get_label_info(":$target_name", "label_no_toolchain") ],
               [
-                "//components*",
+                "//components/cronet*",
 
                 # This is due to the "special group" bypass.
                 "*_bundle_module__java__header",

components/autofill/android/BUILD.gn

@@ -41,6 +41,7 @@ android_library("autofill_java") {
     "//base:base_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//ui/android:ui_java",
   ]

components/background_task_scheduler/BUILD.gn

@@ -95,6 +95,7 @@ if (is_android) {
     deps = [
       ":public_java",
       "internal:internal_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
     ]
   }
 

components/background_task_scheduler/internal/BUILD.gn

@@ -107,6 +107,7 @@ if (is_android) {
       "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
       "//components/background_task_scheduler:public_java",
       "//content/public/test/android:content_java_test_support",
+      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",
     ]

components/browser_ui/android/bottomsheet/BUILD.gn

@@ -37,7 +37,10 @@ android_resources("java_resources") {
 android_library("manager_java") {
   sources = [ "java/src/org/chromium/components/browser_ui/bottomsheet/ManagedBottomSheetController.java" ]
 
-  deps = [ ":java" ]
+  deps = [
+    ":java",
+    "//ui/android:ui_full_java",
+  ]
 }
 
 android_library_factory("factory_java") {
@@ -46,5 +49,8 @@ android_library_factory("factory_java") {
   deps = [
     ":java",
     ":manager_java",
+    "//base:base_java",
+    "//ui/android:ui_full_java",
+    "//ui/android:ui_utils_java",
   ]
 }

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

@@ -38,6 +38,7 @@ android_library("junit_tests") {
     ":java",
     "//base:base_java",
     "//base:base_junit_test_support",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
   ]

components/browser_ui/banners/android/BUILD.gn

@@ -10,6 +10,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
   ]
 }

components/browser_ui/client_certificate/android/BUILD.gn

@@ -23,6 +23,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//ui/android:ui_java",
   ]

components/browser_ui/media/android/BUILD.gn

@@ -26,6 +26,7 @@ android_library("java") {
     "//services/media_session/public/cpp/android:media_session_java",
     "//services/media_session/public/mojom:mojom_java",
     "//third_party/android_deps:android_support_v4_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
     "//url:gurl_java",
   ]

components/browser_ui/modaldialog/android/BUILD.gn

@@ -18,6 +18,7 @@ android_library("java") {
     "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
 }
@@ -55,7 +56,9 @@ android_library("javatests") {
     ":java_test_resources",
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

components/browser_ui/notifications/android/BUILD.gn

@@ -22,6 +22,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//third_party/android_deps:android_support_v4_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
   ]
 }
@@ -33,5 +34,6 @@ android_library("test_support_java") {
   deps = [
     ":java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 }

components/browser_ui/share/android/BUILD.gn

@@ -45,6 +45,7 @@ android_library("javatests") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//ui/android:ui_java",

components/browser_ui/site_settings/android/BUILD.gn

@@ -94,6 +94,7 @@ android_library("java") {
     "//content/public/android:content_java",
     "//services/device/public/java:device_feature_list_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//ui/android:ui_full_java",
     "//ui/android:ui_utils_java",
@@ -109,6 +110,7 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit",
   ]
 }

components/browser_ui/styles/android/BUILD.gn

@@ -11,6 +11,7 @@ android_library("java") {
     ":java_resources",
     "//base:base_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
   ]
 }

components/browser_ui/webshare/android/BUILD.gn

@@ -16,6 +16,7 @@ android_library("java") {
     "//content/public/android:content_java",
     "//mojo/public/java:system_java",
     "//mojo/public/java/system:system_impl_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_java",
     "//url/mojom:url_mojom_gurl_java",
@@ -36,6 +37,8 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
+    "//third_party/android_deps:androidx_test_runner_java",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//third_party/junit",
   ]

components/browser_ui/widget/android/BUILD.gn

@@ -103,6 +103,7 @@ android_library("java") {
     "//components/embedder_support/android:util_java",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_interpolator_interpolator_java",
@@ -241,9 +242,11 @@ android_library("javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/hamcrest:hamcrest_java",
@@ -294,6 +297,7 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

components/content_capture/android/BUILD.gn

@@ -24,6 +24,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [

components/content_settings/android/BUILD.gn

@@ -23,6 +23,7 @@ android_library("java") {
     "//base:jni_java",
     "//components/embedder_support/android:browser_context_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

components/crash/android/BUILD.gn

@@ -22,6 +22,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   srcjar_deps = [ ":java_enums_srcjar" ]

components/dom_distiller/core/android/BUILD.gn

@@ -9,6 +9,7 @@ android_library("dom_distiller_core_java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/dom_distiller/core/mojom:mojom_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [

components/download/internal/common/BUILD.gn

@@ -117,6 +117,7 @@ if (is_android) {
     deps = [
       "//base:base_java",
       "//base:jni_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_provider:android_provider_java",
     ]
     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

components/download/network/BUILD.gn

@@ -46,6 +46,7 @@ if (is_android) {
       "//base:base_java",
       "//base:jni_java",
       "//net/android:net_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
     ]
     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }

components/embedder_support/android/BUILD.gn

@@ -46,6 +46,7 @@ android_library("util_java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//url:gurl_java",
   ]
 }
@@ -89,6 +90,7 @@ android_library("content_view_java") {
   deps = [
     "//base:base_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
   sources = [
@@ -163,6 +165,7 @@ android_library("web_contents_delegate_java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//ui/android:ui_java",
   ]
@@ -206,6 +209,7 @@ generate_jni("context_menu_jni_headers") {
 
 android_library("context_menu_java") {
   deps = [
+    "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
@@ -256,6 +260,7 @@ java_library("components_embedder_support_junit_tests") {
   deps = [
     ":util_java",
     "//base:base_junit_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
   ]
@@ -273,6 +278,7 @@ android_library("web_contents_delegate_javatests") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",

components/external_intents/android/BUILD.gn

@@ -77,12 +77,15 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
     "//ui/android:ui_java",
+    "//url:origin_java",
   ]
 }

components/gcm_driver/android/BUILD.gn

@@ -13,6 +13,7 @@ android_library("gcm_driver_java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_sdk:android_gcm_java",
   ]

components/gcm_driver/instance_id/android/BUILD.gn

@@ -19,6 +19,7 @@ android_library("instance_id_driver_java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/gcm_driver/android:gcm_driver_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 

components/infobars/android/BUILD.gn

@@ -72,6 +72,7 @@ android_library("java") {
     "//base:jni_java",
     "//components/browser_ui/widget/android:java",
     "//components/infobars/core:infobar_enums_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//ui/android:ui_java",
@@ -109,6 +110,7 @@ android_library("javatests") {
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",

components/javascript_dialogs/android/BUILD.gn

@@ -22,6 +22,7 @@ android_library("java") {
     "//base:jni_java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
 }

components/minidump_uploader/BUILD.gn

@@ -54,6 +54,7 @@ android_library("minidump_uploader_javatests") {
     ":minidump_uploader_java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]

components/module_installer/android/BUILD.gn

@@ -36,6 +36,7 @@ android_library("module_installer_java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/crash/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/google_android_play_core:com_google_android_play_core_java",
   ]
 

components/navigation_interception/android/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("navigation_interception_java") {
   deps = [
     "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//url:origin_java",
   ]
   sources = [

components/omnibox/browser/BUILD.gn

@@ -321,6 +321,7 @@ if (is_android) {
       "//components/embedder_support/android:util_java",
       "//components/security_state/core:security_state_enums_java",
       "//content/public/android:content_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:androidx_core_core_java",
       "//ui/android:ui_full_java",
     ]

components/paint_preview/player/android/BUILD.gn

@@ -78,6 +78,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/paint_preview/browser/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
@@ -122,6 +123,7 @@ android_library("javatests") {
     "//base:base_java_test_support",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/hamcrest:hamcrest_java",
@@ -171,6 +173,8 @@ junit_binary("paint_preview_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
+    "//url:gurl_java",
   ]
 }

components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerCompositorDelegateImpl.java

@@ -8,6 +8,8 @@ import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import org.chromium.base.Callback;
 import org.chromium.base.UnguessableToken;
 import org.chromium.base.annotations.CalledByNative;
@@ -16,8 +18,6 @@ import org.chromium.base.annotations.NativeMethods;
 import org.chromium.components.paintpreview.browser.NativePaintPreviewServiceProvider;
 import org.chromium.url.GURL;
 
-import javax.annotation.Nonnull;
-
 /**
  * This class and its native counterpart (player_compositor_delegate.cc) communicate with the Paint
  * Preview compositor.
@@ -35,7 +35,7 @@ class PlayerCompositorDelegateImpl implements PlayerCompositorDelegate {
     private long mNativePlayerCompositorDelegate;
 
     PlayerCompositorDelegateImpl(NativePaintPreviewServiceProvider service, GURL url,
-            String directoryKey, @Nonnull CompositorListener compositorListener,
+            String directoryKey, @NonNull CompositorListener compositorListener,
             Runnable compositorErrorCallback) {
         mCompositorListener = compositorListener;
         if (service != null && service.getNativeService() != 0) {

components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerManager.java

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
@@ -23,8 +24,6 @@ import org.chromium.url.GURL;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 /**
  * This is the only public class in this package and is hence the access point of this component for
  * the outer world. Users should call {@link #destroy()}  to ensure the native part is destroyed.
@@ -58,7 +57,7 @@ public class PlayerManager {
      */
     public PlayerManager(GURL url, Context context,
             NativePaintPreviewServiceProvider nativePaintPreviewServiceProvider,
-            String directoryKey, @Nonnull LinkClickHandler linkClickHandler,
+            String directoryKey, @NonNull LinkClickHandler linkClickHandler,
             @Nullable Runnable refreshCallback, Runnable viewReadyCallback,
             Runnable userInteractionCallback, int backgroundColor, Runnable compositorErrorCallback,
             boolean ignoreInitialScrollOffset) {

components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/PlayerSwipeRefreshHandler.java

@@ -8,9 +8,9 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 
-import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
 
-import javax.annotation.Nonnull;
+import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
 
 /**
  * A class for handling overscroll to refresh behavior for the Paint Preview player. This is based
@@ -33,7 +33,7 @@ public class PlayerSwipeRefreshHandler implements OverscrollHandler {
      * @param context The Context to create tha handler for.
      * @param refreshCallback The handler that refresh events are delegated to.
      */
-    public PlayerSwipeRefreshHandler(Context context, @Nonnull Runnable refreshCallback) {
+    public PlayerSwipeRefreshHandler(Context context, @NonNull Runnable refreshCallback) {
         mRefreshCallback = refreshCallback;
         mSwipeRefreshLayout = new SwipeRefreshLayout(context);
         mSwipeRefreshLayout.setLayoutParams(

components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/frame/PlayerFrameBitmapPainter.java

@@ -9,7 +9,7 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.util.Size;
 
-import javax.annotation.Nonnull;
+import androidx.annotation.NonNull;
 
 /**
  * Given a viewport {@link Rect} and a matrix of {@link Bitmap} tiles, this class draws the bitmaps
@@ -23,7 +23,7 @@ class PlayerFrameBitmapPainter {
     private Rect mDrawBitmapDst = new Rect();
     private Runnable mInvalidateCallback;
 
-    PlayerFrameBitmapPainter(@Nonnull Runnable invalidateCallback) {
+    PlayerFrameBitmapPainter(@NonNull Runnable invalidateCallback) {
         mInvalidateCallback = invalidateCallback;
     }
 

components/payments/content/android/BUILD.gn

@@ -118,6 +118,8 @@ android_library("java") {
     "//components/payments/mojom:mojom_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
+    "//mojo/public/java:system_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//url:gurl_java",
     "//url:origin_java",

components/permissions/android/BUILD.gn

@@ -126,6 +126,7 @@ android_library("java") {
     "//components/content_settings/android:content_settings_enums_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v4_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

components/policy/android/BUILD.gn

@@ -13,6 +13,7 @@ android_library("policy_java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
@@ -30,6 +31,7 @@ android_library("policy_java_test_support") {
     ":policy_java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/junit",
   ]
   sources = [

components/query_tiles/BUILD.gn

@@ -85,6 +85,7 @@ if (is_android) {
       "//base:base_java",
       "//base:jni_java",
       "//components/browser_ui/widget/android:java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
       "//ui/android:ui_java",
     ]
@@ -120,6 +121,7 @@ if (is_android) {
       ":test_support_java",
       "//base:base_java",
       "//base:base_junit_test_support",
+      "//third_party/android_deps:robolectric_all_java",
       "//third_party/junit",
     ]
   }

components/search_engines/android/BUILD.gn

@@ -9,6 +9,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//url:gurl_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

components/signin/core/browser/android/BUILD.gn

@@ -69,6 +69,7 @@ java_library("components_signin_junit_tests") {
     "//base:base_junit_test_support",
     "//testing/android/junit:junit_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_support_test_runner:rules_java",
@@ -88,6 +89,7 @@ android_library("signin_javatests") {
     "//base:base_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_test_monitor_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -104,6 +106,7 @@ android_library("signin_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/junit",
   ]

components/signin/public/android/BUILD.gn

@@ -46,6 +46,7 @@ android_library("javatests") {
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

components/strictmode/android/BUILD.gn

@@ -13,7 +13,10 @@ android_library("java") {
     "java/src/org/chromium/components/strictmode/ThreadStrictModeInterceptorP.java",
     "java/src/org/chromium/components/strictmode/Violation.java",
   ]
-  deps = [ "//base:base_java" ]
+  deps = [
+    "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+  ]
 }
 
 android_library("javatests") {
@@ -25,6 +28,7 @@ android_library("javatests") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]

components/sync/BUILD.gn

@@ -594,6 +594,7 @@ if (is_android) {
     deps = [
       "android:sync_java",
       "//base:base_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/junit",
     ]
     sources = [ "test/android/javatests/src/org/chromium/components/sync/test/util/MockSyncContentResolverDelegate.java" ]

components/translate/content/android/BUILD.gn

@@ -37,6 +37,7 @@ android_library("java") {
     ":java_resources",
     "//base:base_java",
     "//components/browser_ui/widget/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:com_google_android_material_material_java",
@@ -75,6 +76,7 @@ android_library("javatests") {
     "//base:base_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",

components/url_formatter/android/BUILD.gn

@@ -8,6 +8,7 @@ android_library("url_formatter_java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//url:gurl_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

components/user_prefs/android/BUILD.gn

@@ -15,6 +15,7 @@ android_library("java") {
     "//base:jni_java",
     "//components/embedder_support/android:browser_context_java",
     "//components/prefs/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

components/variations/BUILD.gn

@@ -96,7 +96,10 @@ if (is_android) {
   }
 
   android_library("load_seed_result_enum_java") {
-    deps = [ "//base:base_java" ]
+    deps = [
+      "//base:base_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+    ]
     srcjar_deps = [ ":load_seed_result_enum_srcjar" ]
   }
 

components/variations/android/BUILD.gn

@@ -8,6 +8,7 @@ android_library("variations_java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

components/version_info/android/BUILD.gn

@@ -18,6 +18,7 @@ android_library("version_constants_java") {
   deps = [
     ":generate_version_constants",
     "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   srcjar_deps = [ ":channel_enum_srcjar" ]
 }

components/webrtc/android/BUILD.gn

@@ -14,6 +14,7 @@ android_library("java") {
     "//base:base_java",
     "//components/browser_ui/notifications/android:java",
     "//components/url_formatter/android:url_formatter_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
   ]
 }