android_deps: undo manual changes to build.gn file.

These changes were manually added into build.gn file for androidx
migration. They are no longer needed now that the import calls have
moved over.

Bug: 1067050,1067070
Change-Id: Ia7cd36bf52b39444a2dec6bdc065e41b187a2c1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2160011Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762093}

android_webview/nonembedded/BUILD.gn

@@ -57,7 +57,7 @@ android_library("devui_java") {
     "//base:base_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//ui/android:ui_java",
   ]
   android_manifest_for_lint = system_webview_android_manifest

chrome/android/BUILD.gn

@@ -421,11 +421,11 @@ android_library("chrome_java") {
     # ClearBrowsingDataTabsFramgent.java is converted to AndroidX.
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",

chrome/android/feed/feed_java_sources.gni

@@ -12,9 +12,9 @@ if (enable_feed_in_chrome) {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_cardview_cardview_java",
     "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",

chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java

@@ -18,7 +18,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -33,6 +32,7 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;

chrome/test/android/BUILD.gn

@@ -44,8 +44,8 @@ android_library("chrome_java_test_pagecontroller") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
+    "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
     "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
-    "//third_party/android_deps:com_android_support_drawerlayout_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/guava:guava_android_java",
     "//third_party/junit",
@@ -236,11 +236,11 @@ android_library("chrome_java_test_support") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_android_support_appcompat_v7_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_sdk:android_test_base_java",

components/browser_ui/widget/android/BUILD.gn

@@ -98,8 +98,8 @@ 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_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
   ]

remoting/android/client_java_tmpl.gni

@@ -89,8 +89,8 @@ template("remoting_android_client_java_tmpl") {
       "//remoting/proto/remoting/v1:directory_proto_java",
       "//third_party/android_deps:android_support_v7_appcompat_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
       "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
-      "//third_party/android_deps:com_android_support_drawerlayout_java",
       "//third_party/android_deps:com_android_support_mediarouter_v7_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
       "//ui/android:ui_utils_java",

third_party/android_deps/BUILD.gn

@@ -7,14 +7,15 @@ import("//build/config/android/rules.gni")
 # Library groups
 java_group("android_support_v4_java") {
   deps = [
-    ":android_arch_lifecycle_common_java",
-    ":android_arch_lifecycle_viewmodel_java",
-    ":com_android_support_drawerlayout_java",
-    ":com_android_support_interpolator_java",
+    ":androidx_core_core_java",
+    ":androidx_drawerlayout_drawerlayout_java",
+    ":androidx_interpolator_interpolator_java",
+    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_lifecycle_lifecycle_common_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_java",
     ":com_android_support_recyclerview_v7_java",
     ":com_android_support_support_compat_java",
-    ":com_android_support_support_core_ui_java",
-    ":com_android_support_support_core_utils_java",
     ":com_android_support_support_fragment_java",
     ":com_android_support_support_media_compat_java",
     ":com_android_support_support_v4_java",
@@ -34,31 +35,6 @@ java_group("android_support_v7_appcompat_java") {
       [ "${target_out_dir}/com_android_support_appcompat_v7_java/classes.jar" ]
 }
 
-java_group("android_arch_lifecycle_common_java") {
-  deps = [ ":androidx_lifecycle_lifecycle_common_java" ]
-  input_jars_paths = [ "libs/android_arch_lifecycle_common/common-1.1.1.jar" ]
-}
-
-java_group("com_android_support_drawerlayout_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_drawerlayout_drawerlayout_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_drawerlayout_java_orig/classes.jar",
-  ]
-}
-
-java_group("com_android_support_interpolator_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_interpolator_interpolator_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_interpolator_java_orig/classes.jar",
-  ]
-}
-
 java_group("com_android_support_mediarouter_v7_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -67,15 +43,6 @@ java_group("com_android_support_mediarouter_v7_java") {
   input_jars_paths = [ "${target_out_dir}/com_android_support_mediarouter_v7_java_orig/classes.jar" ]
 }
 
-java_group("com_android_support_multidex_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_multidex_multidex_java",
-  ]
-  input_jars_paths =
-      [ "${target_out_dir}/com_android_support_multidex_java_orig/classes.jar" ]
-}
-
 java_group("com_android_support_recyclerview_v7_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -97,22 +64,6 @@ java_group("com_android_support_support_compat_java") {
   input_jars_paths = [ "${target_out_dir}/com_android_support_support_compat_java_orig/classes.jar" ]
 }
 
-java_group("com_android_support_support_core_ui_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_legacy_legacy_support_core_ui_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_support_core_ui_java_orig/classes.jar" ]
-}
-
-java_group("com_android_support_support_core_utils_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_legacy_legacy_support_core_utils_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_support_core_utils_java_orig/classes.jar" ]
-}
-
 java_group("com_android_support_support_fragment_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -174,7 +125,7 @@ java_group("com_google_protobuf_protobuf_lite_java") {
 
 # === Generated Code Start ===
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("android_arch_lifecycle_common_java_orig") {
+java_prebuilt("android_arch_lifecycle_common_java") {
   jar_path = "libs/android_arch_lifecycle_common/common-1.1.1.jar"
   output_name = "android_arch_lifecycle_common"
   supports_android = true
@@ -188,7 +139,7 @@ java_prebuilt("android_arch_lifecycle_common_java8_java") {
   output_name = "android_arch_lifecycle_common_java8"
   supports_android = true
   deps = [
-    ":android_arch_lifecycle_common_java_orig",
+    ":android_arch_lifecycle_common_java",
     ":com_android_support_support_annotations_java_orig",
   ]
   skip_jetify = true
@@ -201,7 +152,7 @@ android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
       "libs/android_arch_lifecycle_runtime/android_arch_lifecycle_runtime.info"
   deps = [
     ":android_arch_core_common_java",
-    ":android_arch_lifecycle_common_java_orig",
+    ":android_arch_lifecycle_common_java",
     ":com_android_support_support_annotations_java_orig",
   ]
   skip_jetify = true
@@ -735,7 +686,7 @@ android_aar_prebuilt("com_android_support_appcompat_v7_java") {
     ":com_android_support_cursoradapter_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_utils_java",
     ":com_android_support_support_fragment_java_orig",
     ":com_android_support_support_vector_drawable_java",
   ]
@@ -809,8 +760,8 @@ android_aar_prebuilt("com_android_support_design_java") {
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_ui_java",
+    ":com_android_support_support_core_utils_java",
     ":com_android_support_support_fragment_java_orig",
     ":com_android_support_transition_java",
   ]
@@ -819,7 +770,7 @@ android_aar_prebuilt("com_android_support_design_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_drawerlayout_java_orig") {
+android_aar_prebuilt("com_android_support_drawerlayout_java") {
   aar_path = "libs/com_android_support_drawerlayout/drawerlayout-28.0.0.aar"
   info_path = "libs/com_android_support_drawerlayout/com_android_support_drawerlayout.info"
   deps = [
@@ -836,13 +787,13 @@ android_aar_prebuilt("com_android_support_gridlayout_v7_java") {
   info_path = "libs/com_android_support_gridlayout_v7/com_android_support_gridlayout_v7.info"
   deps = [
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
+    ":com_android_support_support_core_ui_java",
   ]
   skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_interpolator_java_orig") {
+android_aar_prebuilt("com_android_support_interpolator_java") {
   aar_path = "libs/com_android_support_interpolator/interpolator-28.0.0.aar"
   info_path = "libs/com_android_support_interpolator/com_android_support_interpolator.info"
   skip_jetify = true
@@ -874,7 +825,7 @@ android_aar_prebuilt("com_android_support_mediarouter_v7_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_multidex_java_orig") {
+android_aar_prebuilt("com_android_support_multidex_java") {
   aar_path = "libs/com_android_support_multidex/multidex-1.0.0.aar"
   info_path =
       "libs/com_android_support_multidex/com_android_support_multidex.info"
@@ -924,7 +875,7 @@ android_aar_prebuilt("com_android_support_recyclerview_v7_java_orig") {
   deps = [
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
+    ":com_android_support_support_core_ui_java",
   ]
   skip_jetify = true
 }
@@ -964,7 +915,7 @@ android_aar_prebuilt("com_android_support_support_compat_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_support_core_ui_java_orig") {
+android_aar_prebuilt("com_android_support_support_core_ui_java") {
   aar_path =
       "libs/com_android_support_support_core_ui/support-core-ui-28.0.0.aar"
   info_path = "libs/com_android_support_support_core_ui/com_android_support_support_core_ui.info"
@@ -973,12 +924,12 @@ android_aar_prebuilt("com_android_support_support_core_ui_java_orig") {
     ":com_android_support_coordinatorlayout_java",
     ":com_android_support_cursoradapter_java",
     ":com_android_support_customview_java",
-    ":com_android_support_drawerlayout_java_orig",
-    ":com_android_support_interpolator_java_orig",
+    ":com_android_support_drawerlayout_java",
+    ":com_android_support_interpolator_java",
     ":com_android_support_slidingpanelayout_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_utils_java",
     ":com_android_support_swiperefreshlayout_java",
     ":com_android_support_viewpager_java",
   ]
@@ -986,7 +937,7 @@ android_aar_prebuilt("com_android_support_support_core_ui_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_support_core_utils_java_orig") {
+android_aar_prebuilt("com_android_support_support_core_utils_java") {
   aar_path = "libs/com_android_support_support_core_utils/support-core-utils-28.0.0.aar"
   info_path = "libs/com_android_support_support_core_utils/com_android_support_support_core_utils.info"
   deps = [
@@ -1010,8 +961,8 @@ android_aar_prebuilt("com_android_support_support_fragment_java_orig") {
     ":com_android_support_loader_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_ui_java",
+    ":com_android_support_support_core_utils_java",
   ]
   skip_jetify = true
 }
@@ -1031,8 +982,8 @@ android_aar_prebuilt("com_android_support_support_v4_java_orig") {
       "libs/com_android_support_support_v4/com_android_support_support_v4.info"
   deps = [
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_ui_java",
+    ":com_android_support_support_core_utils_java",
     ":com_android_support_support_fragment_java_orig",
     ":com_android_support_support_media_compat_java_orig",
   ]
@@ -1044,7 +995,7 @@ android_aar_prebuilt("com_android_support_swiperefreshlayout_java") {
   aar_path = "libs/com_android_support_swiperefreshlayout/swiperefreshlayout-28.0.0.aar"
   info_path = "libs/com_android_support_swiperefreshlayout/com_android_support_swiperefreshlayout.info"
   deps = [
-    ":com_android_support_interpolator_java_orig",
+    ":com_android_support_interpolator_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
   ]
@@ -1603,7 +1554,7 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
   deps = [
     ":android_arch_core_common_java",
     ":android_arch_core_runtime_java",
-    ":android_arch_lifecycle_common_java_orig",
+    ":android_arch_lifecycle_common_java",
   ]
   skip_jetify = true
 }
@@ -1856,7 +1807,7 @@ android_aar_prebuilt("com_android_support_animated_vector_drawable_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":com_android_support_support_core_ui_java_orig",
+    ":com_android_support_support_core_ui_java",
     ":com_android_support_support_vector_drawable_java",
   ]
   skip_jetify = true
@@ -1897,7 +1848,7 @@ android_aar_prebuilt("com_android_support_leanback_v17_java") {
   deps = [
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_ui_java_orig",
+    ":com_android_support_support_core_ui_java",
     ":com_android_support_support_fragment_java_orig",
     ":com_android_support_support_media_compat_java_orig",
   ]
@@ -1932,7 +1883,7 @@ android_aar_prebuilt("com_android_support_palette_v7_java") {
   visibility = [ ":*" ]
   deps = [
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_support_core_utils_java_orig",
+    ":com_android_support_support_core_utils_java",
   ]
   skip_jetify = true
 }
@@ -2026,7 +1977,7 @@ android_aar_prebuilt("com_android_support_transition_java") {
     ":com_android_support_support_compat_java_orig",
   ]
   skip_jetify = true
-  deps += [ ":com_android_support_support_fragment_java" ]
+  deps += [ ":com_android_support_support_fragment_java_orig" ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.

third_party/android_swipe_refresh/BUILD.gn

@@ -15,7 +15,7 @@ android_library("android_swipe_refresh_java") {
   ]
   deps = [
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
-    "//third_party/android_deps:com_android_support_support_core_ui_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
   ]
 }

third_party/robolectric/BUILD.gn

@@ -1114,7 +1114,7 @@ java_library("shadows_multidex_java") {
     ":robolectric_shadowapi_java",
     ":robolectric_utils_java",
     ":shadows_core_java",
-    "//third_party/android_deps:com_android_support_multidex_java_orig",
+    "//third_party/android_deps:com_android_support_multidex_java",
     "//third_party/android_deps:com_google_code_gson_gson_java",
     "//third_party/android_deps:com_google_guava_guava_java",
   ]
@@ -1167,6 +1167,7 @@ java_library("shadows_play_services_java") {
     "$google_play_services_package:google_play_services_basement_java",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
+    "//third_party/android_deps:com_android_support_support_fragment_java",
     "//third_party/android_deps:com_google_code_gson_gson_java",
     "//third_party/android_deps:com_google_guava_guava_java",
   ]

weblayer/browser/android/javatests/BUILD.gn

@@ -45,7 +45,7 @@ android_library("weblayer_java_tests") {
     "//net/android:net_java_test_support",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",
@@ -70,7 +70,7 @@ android_library("weblayer_private_java_tests") {
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",

weblayer/public/java/BUILD.gn

@@ -74,11 +74,11 @@ android_library("java") {
     ":client_resources",
     ":client_version",
     ":weblayer_client_manifest",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
     "//weblayer/browser/java:interfaces_java",
   ]