android_deps: Undo manual build.gn file changes.

File was manually modified for androidx_migration. This undoes some
of those manual renames and removes some unneeded groups that contained
both androidx and android_support classes.

Bug: 1067070
Change-Id: I98ef71dbeab6c2603a50696ef5995f300471bd39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159047Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761073}

chrome/android/java/monochrome_public_bundle.proguard_flags.expected

@@ -664,7 +664,7 @@
 -keep class android.support.v4.app.CoreComponentFactory
 
 ################################################################################
-# obj/third_party/android_deps/com_android_support_versionedparcelable_java_orig/proguard.txt
+# obj/third_party/android_deps/com_android_support_versionedparcelable_java/proguard.txt
 ################################################################################
 -keep public class * extends androidx.versionedparcelable.VersionedParcelable
 -keep public class android.support.**Parcelizer { *; }

third_party/android_deps/BUILD.gn

@@ -39,35 +39,6 @@ java_group("android_arch_lifecycle_common_java") {
   input_jars_paths = [ "libs/android_arch_lifecycle_common/common-1.1.1.jar" ]
 }
 
-java_group("android_arch_lifecycle_viewmodel_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_lifecycle_lifecycle_viewmodel_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/android_arch_lifecycle_viewmodel_java_orig/classes.jar",
-  ]
-}
-
-java_group("com_android_support_cardview_v7_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_cardview_cardview_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_cardview_v7_java_orig/classes.jar",
-  ]
-}
-
-java_group("com_android_support_design_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":com_google_android_material_material_java",
-  ]
-  input_jars_paths =
-      [ "${target_out_dir}/com_android_support_design_java_orig/classes.jar" ]
-}
-
 java_group("com_android_support_drawerlayout_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -168,14 +139,6 @@ java_group("com_android_support_support_v4_java") {
   ]
 }
 
-java_group("com_android_support_versionedparcelable_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_versionedparcelable_versionedparcelable_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_versionedparcelable_java_orig/classes.jar" ]
-}
-
 # The dependencies below are used by chromecast internal.
 java_group("android_support_v7_preference_java") {
   deps = [ ":androidx_preference_preference_java" ]
@@ -248,7 +211,7 @@ android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("android_arch_lifecycle_viewmodel_java_orig") {
+android_aar_prebuilt("android_arch_lifecycle_viewmodel_java") {
   aar_path = "libs/android_arch_lifecycle_viewmodel/viewmodel-1.1.1.aar"
   info_path = "libs/android_arch_lifecycle_viewmodel/android_arch_lifecycle_viewmodel.info"
   skip_jetify = true
@@ -756,7 +719,7 @@ android_aar_prebuilt("com_android_support_appcompat_v7_java") {
   info_path = "libs/com_android_support_appcompat_v7/com_android_support_appcompat_v7.info"
   deps = [
     ":com_android_support_animated_vector_drawable_java",
-    ":com_android_support_collections_java_orig",
+    ":com_android_support_collections_java",
     ":com_android_support_cursoradapter_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
@@ -780,7 +743,7 @@ android_aar_prebuilt("com_android_support_asynclayoutinflater_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_cardview_v7_java_orig") {
+android_aar_prebuilt("com_android_support_cardview_v7_java") {
   aar_path = "libs/com_android_support_cardview_v7/cardview-v7-28.0.0.aar"
   info_path = "libs/com_android_support_cardview_v7/com_android_support_cardview_v7.info"
   skip_jetify = true
@@ -788,7 +751,7 @@ android_aar_prebuilt("com_android_support_cardview_v7_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("com_android_support_collections_java_orig") {
+java_prebuilt("com_android_support_collections_java") {
   jar_path = "libs/com_android_support_collections/collections-28.0.0.jar"
   output_name = "com_android_support_collections"
   supports_android = true
@@ -825,12 +788,12 @@ android_aar_prebuilt("com_android_support_customview_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_design_java_orig") {
+android_aar_prebuilt("com_android_support_design_java") {
   aar_path = "libs/com_android_support_design/design-28.0.0.aar"
   info_path = "libs/com_android_support_design/com_android_support_design.info"
   deps = [
     ":com_android_support_appcompat_v7_java",
-    ":com_android_support_cardview_v7_java_orig",
+    ":com_android_support_cardview_v7_java",
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
@@ -912,7 +875,7 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
   info_path = "libs/com_android_support_preference_leanback_v17/com_android_support_preference_leanback_v17.info"
   deps = [
     ":com_android_support_appcompat_v7_java",
-    ":com_android_support_collections_java_orig",
+    ":com_android_support_collections_java",
     ":com_android_support_leanback_v17_java",
     ":com_android_support_preference_v14_java",
     ":com_android_support_preference_v7_java",
@@ -928,7 +891,7 @@ android_aar_prebuilt("com_android_support_preference_v7_java") {
   info_path = "libs/com_android_support_preference_v7/com_android_support_preference_v7.info"
   deps = [
     ":com_android_support_appcompat_v7_java",
-    ":com_android_support_collections_java_orig",
+    ":com_android_support_collections_java",
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_compat_java_orig",
     ":com_android_support_support_fragment_java_orig",
@@ -971,9 +934,9 @@ android_aar_prebuilt("com_android_support_support_compat_java_orig") {
   info_path = "libs/com_android_support_support_compat/com_android_support_support_compat.info"
   deps = [
     ":android_arch_lifecycle_runtime_java",
-    ":com_android_support_collections_java_orig",
+    ":com_android_support_collections_java",
     ":com_android_support_support_annotations_java_orig",
-    ":com_android_support_versionedparcelable_java_orig",
+    ":com_android_support_versionedparcelable_java",
   ]
   skip_jetify = true
   ignore_aidl = true
@@ -1031,7 +994,7 @@ android_aar_prebuilt("com_android_support_support_fragment_java_orig") {
       "libs/com_android_support_support_fragment/support-fragment-28.0.0.aar"
   info_path = "libs/com_android_support_support_fragment/com_android_support_support_fragment.info"
   deps = [
-    ":android_arch_lifecycle_viewmodel_java_orig",
+    ":android_arch_lifecycle_viewmodel_java",
     ":com_android_support_loader_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
@@ -1939,7 +1902,7 @@ android_aar_prebuilt("com_android_support_loader_java") {
   visibility = [ ":*" ]
   deps = [
     ":android_arch_lifecycle_livedata_java",
-    ":android_arch_lifecycle_viewmodel_java_orig",
+    ":android_arch_lifecycle_viewmodel_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
   ]
@@ -2015,7 +1978,7 @@ android_aar_prebuilt("com_android_support_support_media_compat_java_orig") {
   deps = [
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
-    ":com_android_support_versionedparcelable_java_orig",
+    ":com_android_support_versionedparcelable_java",
   ]
   skip_jetify = true
   ignore_aidl = true
@@ -2055,7 +2018,7 @@ android_aar_prebuilt("com_android_support_transition_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_versionedparcelable_java_orig") {
+android_aar_prebuilt("com_android_support_versionedparcelable_java") {
   aar_path = "libs/com_android_support_versionedparcelable/versionedparcelable-28.0.0.aar"
   info_path = "libs/com_android_support_versionedparcelable/com_android_support_versionedparcelable.info"
 
@@ -2063,7 +2026,7 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":com_android_support_collections_java_orig",
+    ":com_android_support_collections_java",
     ":com_android_support_support_annotations_java_orig",
   ]
   skip_jetify = true

third_party/android_sdk/androidx_browser/BUILD.gn

@@ -44,12 +44,12 @@ android_library("androidx_browser_java") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_concurrent_concurrent_futures_java",
+    "//third_party/android_deps:com_android_support_collections_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
 
     # TODO(bjoyce): Remove when androidx migration is complete.
     # crbug.com/1047843
-    "//third_party/android_deps:com_android_support_collections_java_orig",
     "//third_party/android_deps:com_android_support_support_compat_java_orig",
   ]
   srcjar_deps = [ ":androidx_browser_service_aidl" ]