Android: Add direct deps for turbine

Remove //{base,remoting,third_party,ui,weblayer}* from allowlist.

Allow depending on androidx_media_media_java.

LICENSE updates are from upstream, automated by fetch_all.py.

Bug: 1080903,1082904
Change-Id: I20240ab7f065670eb283e16dd32e278750729105
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303022
Auto-Submit: Peter Wen <wnwen@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789292}

base/BUILD.gn

@@ -3624,7 +3624,9 @@ if (is_android) {
       ":jni_java",
       "//base/test:test_support_java",
       "//third_party/android_deps:androidx_test_monitor_java",
+      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
+      "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/hamcrest:hamcrest_java",
       "//third_party/junit:junit",
@@ -3836,6 +3838,8 @@ if (is_android) {
       ":base_junit_test_support",
       ":jni_java",
       "//base/test:test_support_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/hamcrest:hamcrest_java",
     ]
   }

build/config/android/internal_rules.gni

@@ -3036,14 +3036,9 @@ if (enable_java_templates) {
           filter_exclude(
               [ get_label_info(":$target_name", "label_no_toolchain") ],
               [
-                "//base*",
                 "//chrome/browser*",
                 "//clank*",
                 "//components*",
-                "//remoting*",
-                "//third_party*",
-                "//ui*",
-                "//weblayer*",
 
                 # This is due to the "special group" bypass.
                 "*_bundle_module__java__header",

remoting/android/BUILD.gn

@@ -181,6 +181,7 @@ instrumentation_test_apk("remoting_test_apk") {
     ":remoting_android_client_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:junit",
   ]

third_party/android_deps/BUILD.gn

@@ -466,6 +466,20 @@ android_aar_prebuilt(
   deps = [ ":androidx_annotation_annotation_java" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_media_media_java") {
+  aar_path = "libs/androidx_media_media/media-1.0.0.aar"
+  info_path = "libs/androidx_media_media/androidx_media_media.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_core_core_java",
+    ":androidx_versionedparcelable_versionedparcelable_java",
+  ]
+
+  # Target has AIDL, but we do not support it yet: http://crbug.com/644439
+  ignore_aidl = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_mediarouter_mediarouter_java") {
   aar_path = "libs/androidx_mediarouter_mediarouter/mediarouter-1.0.0.aar"
@@ -1832,24 +1846,6 @@ android_aar_prebuilt("androidx_loader_loader_java") {
   ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_media_media_java") {
-  aar_path = "libs/androidx_media_media/media-1.0.0.aar"
-  info_path = "libs/androidx_media_media/androidx_media_media.info"
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_core_core_java",
-    ":androidx_versionedparcelable_versionedparcelable_java",
-  ]
-
-  # Target has AIDL, but we do not support it yet: http://crbug.com/644439
-  ignore_aidl = true
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_palette_palette_java") {
   aar_path = "libs/androidx_palette_palette/palette-1.0.0.aar"

third_party/android_deps/build.gradle

@@ -44,6 +44,7 @@ dependencies {
     compile "androidx.interpolator:interpolator:${androidXSupportLibVersion}"
     compile "androidx.leanback:leanback-preference:${androidXSupportLibVersion}"
     compile "androidx.localbroadcastmanager:localbroadcastmanager:${androidXSupportLibVersion}"
+    compile "androidx.media:media:${androidXSupportLibVersion}"
     compile "androidx.mediarouter:mediarouter:${androidXSupportLibVersion}"
     compile "androidx.preference:preference:1.1.1"
     compile "androidx.recyclerview:recyclerview:${androidXSupportLibVersion}"

third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE

@@ -13,10 +13,9 @@ the parts that you might want to include with your own program.
    (The text of this license also appears below.)  This applies to the
    checker-qual*.jar and all the files that appear in it:  every file in a
    qual/ directory, plus utility files FormatUtil.java,
-   I18nFormatUtil.java, NullnessUtil.java, Opt.java,
-   PurityUnqualified.java, RegexUtil.java, SignednessUtil.java, and
-   UnitsTools.java.  It also applies to other utility files
-   (SignednessUtilExtra.java) and to the cleanroom implementations of
+   I18nFormatUtil.java, NullnessUtil.java, Opt.java, PurityUnqualified.java,
+   RegexUtil.java, SignednessUtil.java, SignednessUtilExtra.java, and
+   UnitsTools.java.  It also applies to the cleanroom implementations of
    third-party annotations (in checker/src/testannotations/ and in
    framework/src/main/java/org/jmlspecs/).
 

third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE

@@ -13,10 +13,9 @@ the parts that you might want to include with your own program.
    (The text of this license also appears below.)  This applies to the
    checker-qual*.jar and all the files that appear in it:  every file in a
    qual/ directory, plus utility files FormatUtil.java,
-   I18nFormatUtil.java, NullnessUtil.java, Opt.java,
-   PurityUnqualified.java, RegexUtil.java, SignednessUtil.java, and
-   UnitsTools.java.  It also applies to other utility files
-   (SignednessUtilExtra.java) and to the cleanroom implementations of
+   I18nFormatUtil.java, NullnessUtil.java, Opt.java, PurityUnqualified.java,
+   RegexUtil.java, SignednessUtil.java, SignednessUtilExtra.java, and
+   UnitsTools.java.  It also applies to the cleanroom implementations of
    third-party annotations (in checker/src/testannotations/ and in
    framework/src/main/java/org/jmlspecs/).
 

third_party/android_deps/libs/org_checkerframework_dataflow_shaded/LICENSE

@@ -13,10 +13,9 @@ the parts that you might want to include with your own program.
    (The text of this license also appears below.)  This applies to the
    checker-qual*.jar and all the files that appear in it:  every file in a
    qual/ directory, plus utility files FormatUtil.java,
-   I18nFormatUtil.java, NullnessUtil.java, Opt.java,
-   PurityUnqualified.java, RegexUtil.java, SignednessUtil.java, and
-   UnitsTools.java.  It also applies to other utility files
-   (SignednessUtilExtra.java) and to the cleanroom implementations of
+   I18nFormatUtil.java, NullnessUtil.java, Opt.java, PurityUnqualified.java,
+   RegexUtil.java, SignednessUtil.java, SignednessUtilExtra.java, and
+   UnitsTools.java.  It also applies to the cleanroom implementations of
    third-party annotations (in checker/src/testannotations/ and in
    framework/src/main/java/org/jmlspecs/).
 

third_party/android_sdk/androidx_browser/BUILD.gn

@@ -45,6 +45,7 @@ android_library("androidx_browser_java") {
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_concurrent_concurrent_futures_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:com_google_guava_listenablefuture_java",
   ]
   srcjar_deps = [ ":androidx_browser_service_aidl" ]
   chromium_code = false

third_party/blink/public/BUILD.gn

@@ -82,6 +82,7 @@ if (is_android) {
   android_library("blink_headers_java") {
     deps = [
       "//services/network/public/mojom:mojom_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
     srcjar_deps = [ ":blink_headers_java_enums_srcjar" ]

third_party/blink/public/mojom/BUILD.gn

@@ -180,13 +180,6 @@ mojom("mojom_platform") {
     "worker/worker_options.mojom",
   ]
 
-  if (is_android) {
-    # TODO(crbug.com/1080903): Figure out how to satisfy deps checker properly.
-    enable_bytecode_checks = false
-  } else {
-    sources += [ "serial/serial.mojom" ]
-  }
-
   if (is_win) {
     sources += [ "dwrite_font_proxy/dwrite_font_proxy.mojom" ]
   }
@@ -230,6 +223,16 @@ mojom("mojom_platform") {
     "//url/mojom:url_mojom_origin",
   ]
 
+  if (is_android) {
+    # Direct deps (instead of transitive deps) are necessary for java targets.
+    public_deps += [
+      "//services/network/public/mojom:cookies_mojom",
+      "//ui/latency/mojom",
+    ]
+  } else {
+    sources += [ "serial/serial.mojom" ]
+  }
+
   if (is_mac) {
     public_deps += [
       "//ui/base/mojom",
@@ -343,9 +346,6 @@ mojom("android_mojo_bindings") {
     "webshare/webshare.mojom",
   ]
 
-  if (is_android) {
-    sources += [ "remote_objects/remote_objects.mojom" ]
-  }
   public_deps = [
     "//components/payments/mojom",
     "//components/schema_org/common:mojom",
@@ -356,6 +356,13 @@ mojom("android_mojo_bindings") {
     "//url/mojom:url_mojom_origin",
   ]
 
+  if (is_android) {
+    sources += [ "remote_objects/remote_objects.mojom" ]
+
+    # Direct deps (instead of transitive deps) are necessary for java targets.
+    public_deps += [ "//services/network/public/mojom:data_pipe_interfaces" ]
+  }
+
   # This Android unhandled-tap feature uses another mojo source, add it in.
   if (enable_unhandled_tap) {
     sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
@@ -443,8 +450,14 @@ mojom("mojom_core") {
   ]
 
   if (is_android) {
-    # TODO(crbug.com/1080903): Figure out how to satisfy deps checker properly.
-    enable_bytecode_checks = false
+    # Direct deps (instead of transitive deps) are necessary for java targets.
+    public_deps += [
+      "//services/data_decoder/public/mojom:mojom_resource_snapshot_for_web_bundle",
+      "//services/network/public/mojom:cookies_mojom",
+      "//third_party/blink/public/mojom/frame",
+      "//third_party/blink/public/mojom/tokens",
+      "//ui/events/mojom",
+    ]
   }
   if (is_mac) {
     public_deps += [

ui/android/BUILD.gn

@@ -211,6 +211,7 @@ android_library("ui_utils_java") {
   deps = [
     "//base:base_java",
     "//components/payments/mojom:mojom_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",
     "//third_party/android_deps:androidx_core_core_java",
@@ -375,6 +376,7 @@ android_library("ui_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/junit",
   ]
@@ -428,8 +430,10 @@ junit_binary("ui_junit_tests") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_asynclayoutinflater_asynclayoutinflater_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
 }
@@ -494,6 +498,7 @@ android_library("ui_javatests") {
     "//base:base_java_test_support",
     "//base:jni_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit",
   ]
 }

weblayer/browser/android/javatests/BUILD.gn

@@ -49,6 +49,7 @@ android_library("weblayer_java_tests") {
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_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",
@@ -82,6 +83,7 @@ android_library("weblayer_private_java_tests") {
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/android_deps:androidx_fragment_fragment_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",
@@ -230,6 +232,7 @@ android_test_apk("weblayer_bundle_test_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//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/junit:junit",

weblayer/browser/java/BUILD.gn

@@ -187,16 +187,19 @@ android_library("java") {
     "//services/network/public/mojom:cookies_mojom_java",
     "//services/network/public/mojom:mojom_java",
     "//services/service_manager/public/java:service_manager_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",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
+    "//third_party/android_deps:androidx_media_media_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_full_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
+    "//url:origin_java",
   ]
   srcjar_deps = [
     ":generated_enums",
@@ -235,6 +238,7 @@ android_library("test_java") {
     ":interfaces_java",
     ":java",
     ":weblayer_test_resources",
+    "//base:base_java",
     "//base:jni_java",
     "//components/infobars/android:java",
     "//components/location/android:location_java",
@@ -243,6 +247,7 @@ android_library("test_java") {
     "//net/android:net_java",
     "//services/device/public/java:geolocation_java",
     "//services/device/public/java:geolocation_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
   ]
   srcjar_deps = [ ":test_aidl" ]

weblayer/public/javatests/BUILD.gn

@@ -14,6 +14,7 @@ android_library("weblayer_public_javatests") {
   deps = [
     "//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:junit",
     "//weblayer/public/java",

weblayer/public/javatestutil/BUILD.gn

@@ -11,6 +11,7 @@ android_library("test_java") {
 
   deps = [
     "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/junit:junit",
     "//weblayer/browser/java:interfaces_java",
     "//weblayer/browser/java:test_java",