Android: Inline build targets into build_java

Now that //build/android:build_java exists, there is no longer a need to
separate out build_config_java and native_libraries_java. This
simplifies the build graph.

Bug: 1038372
Change-Id: Ia78da024272734cd6086ecd9232e7d6baadab8b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3594162
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Owners-Override: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#994710}

base/BUILD.gn

@@ -3948,7 +3948,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/annotations/NativeMethods.java",
     ]
 
-    deps = [ "//build/android:build_config_java" ]
+    deps = [ "//build/android:build_java" ]
   }
 
   java_cpp_features("java_features_srcjar") {

build/android/BUILD.gn

@@ -27,28 +27,15 @@ if (enable_java_templates) {
     use_final_fields = false
   }
 
-  java_library("build_config_java") {
-    supports_android = true
-    srcjar_deps = [ ":build_config_gen" ]
-    jar_excluded_patterns = [ "*/build/BuildConfig.class" ]
-  }
-
   write_native_libraries_java("native_libraries_gen") {
     use_final_fields = false
   }
 
-  android_library("native_libraries_java") {
-    srcjar_deps = [ ":native_libraries_gen" ]
-
-    # New version of NativeLibraries.java (with the actual correct values) will
-    # be created when creating an apk.
-    jar_excluded_patterns = [ "*/NativeLibraries.class" ]
-  }
-
-  android_library("build_java") {
-    public_deps = [
-      ":build_config_java",
-      ":native_libraries_java",
+  java_library("build_java") {
+    supports_android = true
+    srcjar_deps = [
+      ":build_config_gen",
+      ":native_libraries_gen",
     ]
     sources = [
       "java/src/org/chromium/base/annotations/CheckDiscard.java",
@@ -59,6 +46,12 @@ if (enable_java_templates) {
       "java/src/org/chromium/base/annotations/MockedInTests.java",
       "java/src/org/chromium/base/annotations/UsedByReflection.java",
     ]
+
+    jar_excluded_patterns = [ "*/build/BuildConfig.class" ]
+
+    # New version of NativeLibraries.java (with the actual correct values) will
+    # be created when creating an apk.
+    jar_excluded_patterns += [ "*/NativeLibraries.class" ]
   }
 }
 

components/browser_ui/site_settings/android/BUILD.gn

@@ -72,7 +72,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
-    "//build/android:build_config_java",
+    "//build/android:build_java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",

components/cronet/android/BUILD.gn

@@ -362,7 +362,7 @@ cronet_impl_native_java_deps_to_package = [
   ":cronet_urlconnection_impl_java",
   "//base:base_java",
   "//base:jni_java",
-  "//build/android:build_config_java",
+  "//build/android:build_java",
   "//net/android:net_java",
   "//url:url_java",
 ]
@@ -407,7 +407,7 @@ android_library("cronet_impl_native_base_java") {
     ":cronet_api_java",
     ":cronet_impl_common_base_java",
     "//base:jni_java",
-    "//build/android:build_config_java",
+    "//build/android:build_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]