Remove custom changes to android_arch.

Bug: 1052460
Change-Id: Iefa6e94b08665d152b891f0dfd6e12d5788b1adc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109377
Commit-Queue: benjamin joyce <bjoyce@google.com>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751809}

chrome/android/BUILD.gn

@@ -368,14 +368,14 @@ android_library("chrome_java") {
     "//skia/public/mojom:mojom_java",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java8_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_customview_customview_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
 
     # TODO(bjoyce): Change to AndroidX materials after
     # ClearBrowsingDataTabsFramgent.java is converted to AndroidX.

chrome/android/features/autofill_assistant/BUILD.gn

@@ -46,7 +46,6 @@ android_library("java") {
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
@@ -55,6 +54,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -141,12 +141,12 @@ android_library("java") {
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//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_legacy_legacy_support_v13_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//ui/android:ui_java",

chrome/android/features/vr/BUILD.gn

@@ -77,10 +77,10 @@ android_library("java") {
     "//content/public/android:content_java",
     "//device/vr:java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/gvr-android-keyboard:kb_java",
     "//third_party/gvr-android-sdk:gvr_common_java",
     "//ui/android:ui_full_java",

third_party/android_deps/BUILD.gn

@@ -36,59 +36,11 @@ java_group("android_support_v7_appcompat_java") {
   ]
 }
 
-java_group("android_arch_core_common_java") {
-  deps = [ ":androidx_arch_core_core_common_java" ]
-  input_jars_paths = [ "libs/android_arch_core_common/common-1.1.1.jar" ]
-}
-
-java_group("android_arch_core_runtime_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_arch_core_core_runtime_java",
-  ]
-  input_jars_paths =
-      [ "${target_out_dir}/android_arch_core_runtime_java_orig/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("android_arch_lifecycle_common_java8_java") {
-  deps = [ ":androidx_lifecycle_lifecycle_common_java8_java" ]
-  input_jars_paths =
-      [ "libs/android_arch_lifecycle_common_java8/common-java8-1.1.1.jar" ]
-}
-
-java_group("android_arch_lifecycle_livedata_core_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_lifecycle_lifecycle_livedata_core_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/android_arch_lifecycle_livedata_core_java_orig/classes.jar" ]
-}
-
-java_group("android_arch_lifecycle_livedata_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_lifecycle_lifecycle_livedata_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/android_arch_lifecycle_livedata_java_orig/classes.jar",
-  ]
-}
-
-java_group("android_arch_lifecycle_runtime_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_lifecycle_lifecycle_runtime_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/android_arch_lifecycle_runtime_java_orig/classes.jar",
-  ]
-}
-
 java_group("android_arch_lifecycle_viewmodel_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -333,7 +285,7 @@ java_prebuilt("android_arch_lifecycle_common_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("android_arch_lifecycle_common_java8_java_orig") {
+java_prebuilt("android_arch_lifecycle_common_java8_java") {
   jar_path = "libs/android_arch_lifecycle_common_java8/common-java8-1.1.1.jar"
   output_name = "android_arch_lifecycle_common_java8"
   supports_android = true
@@ -345,12 +297,12 @@ java_prebuilt("android_arch_lifecycle_common_java8_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("android_arch_lifecycle_runtime_java_orig") {
+android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
   aar_path = "libs/android_arch_lifecycle_runtime/runtime-1.1.1.aar"
   info_path =
       "libs/android_arch_lifecycle_runtime/android_arch_lifecycle_runtime.info"
   deps = [
-    ":android_arch_core_common_java_orig",
+    ":android_arch_core_common_java",
     ":android_arch_lifecycle_common_java_orig",
     ":com_android_support_support_annotations_java_orig",
   ]
@@ -1015,7 +967,7 @@ android_aar_prebuilt("com_android_support_support_compat_java_orig") {
   aar_path = "libs/com_android_support_support_compat/support-compat-28.0.0.aar"
   info_path = "libs/com_android_support_support_compat/com_android_support_support_compat.info"
   deps = [
-    ":android_arch_lifecycle_runtime_java_orig",
+    ":android_arch_lifecycle_runtime_java",
     ":com_android_support_collections_java_orig",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_versionedparcelable_java_orig",
@@ -1579,7 +1531,7 @@ java_prebuilt("org_ow2_asm_asm_util_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("android_arch_core_common_java_orig") {
+java_prebuilt("android_arch_core_common_java") {
   jar_path = "libs/android_arch_core_common/common-1.1.1.jar"
   output_name = "android_arch_core_common"
   supports_android = true
@@ -1592,7 +1544,7 @@ java_prebuilt("android_arch_core_common_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("android_arch_core_runtime_java_orig") {
+android_aar_prebuilt("android_arch_core_runtime_java") {
   aar_path = "libs/android_arch_core_runtime/runtime-1.1.1.aar"
   info_path = "libs/android_arch_core_runtime/android_arch_core_runtime.info"
 
@@ -1600,14 +1552,14 @@ android_aar_prebuilt("android_arch_core_runtime_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":android_arch_core_common_java_orig",
+    ":android_arch_core_common_java",
     ":com_android_support_support_annotations_java_orig",
   ]
   skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("android_arch_lifecycle_livedata_java_orig") {
+android_aar_prebuilt("android_arch_lifecycle_livedata_java") {
   aar_path = "libs/android_arch_lifecycle_livedata/livedata-1.1.1.aar"
   info_path = "libs/android_arch_lifecycle_livedata/android_arch_lifecycle_livedata.info"
 
@@ -1615,15 +1567,15 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":android_arch_core_common_java_orig",
-    ":android_arch_core_runtime_java_orig",
-    ":android_arch_lifecycle_livedata_core_java_orig",
+    ":android_arch_core_common_java",
+    ":android_arch_core_runtime_java",
+    ":android_arch_lifecycle_livedata_core_java",
   ]
   skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("android_arch_lifecycle_livedata_core_java_orig") {
+android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
   aar_path = "libs/android_arch_lifecycle_livedata_core/livedata-core-1.1.1.aar"
   info_path = "libs/android_arch_lifecycle_livedata_core/android_arch_lifecycle_livedata_core.info"
 
@@ -1631,8 +1583,8 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":android_arch_core_common_java_orig",
-    ":android_arch_core_runtime_java_orig",
+    ":android_arch_core_common_java",
+    ":android_arch_core_runtime_java",
     ":android_arch_lifecycle_common_java_orig",
   ]
   skip_jetify = true
@@ -1980,7 +1932,7 @@ android_aar_prebuilt("com_android_support_loader_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
-    ":android_arch_lifecycle_livedata_java_orig",
+    ":android_arch_lifecycle_livedata_java",
     ":android_arch_lifecycle_viewmodel_java_orig",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",