Revert "Remove unused androidx-legacy libraries"

This reverts commit 9d53cbf. Reason for revert: https://crbug.com/1122225 (build errors for downstream checkouts) Original change's description: > Remove unused androidx-legacy libraries > > As far as I can tell these were never used... > > Bug: 1121713 > Change-Id: Ie81d7bfa72e40b48a775442684aae025a55259f4 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376125 > Commit-Queue: Andrew Grieve <agrieve@chromium.org> > Commit-Queue: benjamin joyce <bjoyce@chromium.org> > Auto-Submit: Andrew Grieve <agrieve@chromium.org> > Reviewed-by: benjamin joyce <bjoyce@chromium.org> > Cr-Commit-Position: refs/heads/master@{#801973} TBR=agrieve@chromium.org,bjoyce@chromium.org Change-Id: I745e025f674b51f012fa138d5abd760444ded1c2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1121713 Fixed: 1122225 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378736 Reviewed-by: Nate Fischer <ntfschr@chromium.org> Commit-Queue: Nate Fischer <ntfschr@chromium.org> Cr-Commit-Position: refs/heads/master@{#802001}
Denger-Network · Aug 26, 2020 · edc1346 · edc1346
1 parent 0079869
commit edc1346
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 42 deletions.
diff --git a/DEPS b/DEPS
@@ -1972,6 +1972,28 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v13': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v13',
+              'version': 'version:1.0.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v4': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v4',
+              'version': 'version:1.0.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common': {
       'packages': [
           {

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -475,6 +475,7 @@ android_library("chrome_java") {
     "//third_party/android_deps:androidx_customview_customview_java",
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_interpolator_interpolator_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",

diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn
@@ -61,6 +61,8 @@ android_library("java") {
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_core_core_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_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",

diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
@@ -214,6 +214,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_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_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",

diff --git a/chrome/browser/util/BUILD.gn b/chrome/browser/util/BUILD.gn
@@ -23,6 +23,7 @@ android_library("java") {
     "//content/public/android:content_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_core_utils_java",
     "//ui/android:ui_full_java",
     "//url:gurl_java",
   ]

diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
@@ -304,6 +304,7 @@ android_library("chrome_java_test_support") {
     "//third_party/android_deps:androidx_appcompat_appcompat_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_google_code_findbugs_jsr305_java",

diff --git a/chromecast/browser/android/BUILD.gn b/chromecast/browser/android/BUILD.gn
@@ -117,6 +117,7 @@ android_library("reactive_android_java") {
   deps = [
     "//base:base_java",
     "//chromecast/base:base_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
     "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
   ]
 }
@@ -190,6 +191,7 @@ android_library("cast_shell_java") {
     "//third_party/android_deps:androidx_core_core_java",
 
     # TODO(slan): We may need to pass this in as a parameter.
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
     "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
     "//third_party/android_deps:androidx_slice_slice_builders_java",
 
@@ -253,6 +255,7 @@ junit_binary("cast_shell_junit_tests") {
     "//chromecast/base:base_java",
     "//chromecast/base:cast_base_test_utils_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
     "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
     "//third_party/hamcrest:hamcrest_java",
   ]

diff --git a/chromecast/media/cma/backend/android/BUILD.gn b/chromecast/media/cma/backend/android/BUILD.gn
@@ -74,6 +74,7 @@ android_library("audio_track_java") {
     "//chromecast/base:base_java",
     "//chromecast/public:volume_control_enums_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

diff --git a/components/variations/android/BUILD.gn b/components/variations/android/BUILD.gn
@@ -9,6 +9,7 @@ android_library("variations_java") {
     "//base:base_java",
     "//base:jni_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [

diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
@@ -11,6 +11,9 @@ java_group("android_support_v4_java") {
     ":androidx_drawerlayout_drawerlayout_java",
     ":androidx_fragment_fragment_java",
     ":androidx_interpolator_interpolator_java",
+    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_legacy_legacy_support_v4_java",
     ":androidx_lifecycle_lifecycle_common_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
     ":androidx_media_media_java",
@@ -62,6 +65,20 @@ java_group("robolectric_all_java") {
   ]
 }
 
+# The dependencies below are used by chromecast internal.
+java_group("android_support_v7_preference_java") {
+  deps = [ ":androidx_preference_preference_java" ]
+}
+java_group("android_support_v14_preference_java") {
+  deps = [ ":androidx_legacy_legacy_preference_v14_java" ]
+}
+java_group("android_support_v17_leanback_java") {
+  deps = [ ":androidx_leanback_leanback_java" ]
+}
+java_group("android_support_v17_preference_java") {
+  deps = [ ":androidx_leanback_leanback_preference_java" ]
+}
+
 java_group("material_design_java") {
   deps = [ "$material_design_target" ]
 }
@@ -342,6 +359,62 @@ android_aar_prebuilt("androidx_leanback_leanback_preference_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_legacy_legacy_support_core_ui_java") {
+  aar_path = "libs/androidx_legacy_legacy_support_core_ui/legacy-support-core-ui-1.0.0.aar"
+  info_path = "libs/androidx_legacy_legacy_support_core_ui/androidx_legacy_legacy_support_core_ui.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_asynclayoutinflater_asynclayoutinflater_java",
+    ":androidx_coordinatorlayout_coordinatorlayout_java",
+    ":androidx_core_core_java",
+    ":androidx_cursoradapter_cursoradapter_java",
+    ":androidx_customview_customview_java",
+    ":androidx_drawerlayout_drawerlayout_java",
+    ":androidx_interpolator_interpolator_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_slidingpanelayout_slidingpanelayout_java",
+    ":androidx_swiperefreshlayout_swiperefreshlayout_java",
+    ":androidx_viewpager_viewpager_java",
+  ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_legacy_legacy_support_core_utils_java") {
+  aar_path = "libs/androidx_legacy_legacy_support_core_utils/legacy-support-core-utils-1.0.0.aar"
+  info_path = "libs/androidx_legacy_legacy_support_core_utils/androidx_legacy_legacy_support_core_utils.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_core_core_java",
+    ":androidx_documentfile_documentfile_java",
+    ":androidx_loader_loader_java",
+    ":androidx_localbroadcastmanager_localbroadcastmanager_java",
+    ":androidx_print_print_java",
+  ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_legacy_legacy_support_v13_java") {
+  aar_path =
+      "libs/androidx_legacy_legacy_support_v13/legacy-support-v13-1.0.0.aar"
+  info_path = "libs/androidx_legacy_legacy_support_v13/androidx_legacy_legacy_support_v13.info"
+  deps = [ ":androidx_legacy_legacy_support_v4_java" ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_legacy_legacy_support_v4_java") {
+  aar_path =
+      "libs/androidx_legacy_legacy_support_v4/legacy-support-v4-1.0.0.aar"
+  info_path = "libs/androidx_legacy_legacy_support_v4/androidx_legacy_legacy_support_v4.info"
+  deps = [
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_media_media_java",
+  ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_lifecycle_lifecycle_common_java") {
   jar_path =
@@ -1827,48 +1900,6 @@ android_aar_prebuilt("androidx_legacy_legacy_preference_v14_java") {
   deps = [ ":androidx_preference_preference_java" ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_legacy_legacy_support_core_ui_java") {
-  aar_path = "libs/androidx_legacy_legacy_support_core_ui/legacy-support-core-ui-1.0.0.aar"
-  info_path = "libs/androidx_legacy_legacy_support_core_ui/androidx_legacy_legacy_support_core_ui.info"
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_asynclayoutinflater_asynclayoutinflater_java",
-    ":androidx_coordinatorlayout_coordinatorlayout_java",
-    ":androidx_core_core_java",
-    ":androidx_cursoradapter_cursoradapter_java",
-    ":androidx_customview_customview_java",
-    ":androidx_drawerlayout_drawerlayout_java",
-    ":androidx_interpolator_interpolator_java",
-    ":androidx_legacy_legacy_support_core_utils_java",
-    ":androidx_slidingpanelayout_slidingpanelayout_java",
-    ":androidx_swiperefreshlayout_swiperefreshlayout_java",
-    ":androidx_viewpager_viewpager_java",
-  ]
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_legacy_legacy_support_core_utils_java") {
-  aar_path = "libs/androidx_legacy_legacy_support_core_utils/legacy-support-core-utils-1.0.0.aar"
-  info_path = "libs/androidx_legacy_legacy_support_core_utils/androidx_legacy_legacy_support_core_utils.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_documentfile_documentfile_java",
-    ":androidx_loader_loader_java",
-    ":androidx_localbroadcastmanager_localbroadcastmanager_java",
-    ":androidx_print_print_java",
-  ]
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_java") {
   aar_path =

diff --git a/third_party/android_deps/additional_readme_paths.json b/third_party/android_deps/additional_readme_paths.json
@@ -33,6 +33,8 @@
     "libs/androidx_legacy_legacy_preference_v14",
     "libs/androidx_legacy_legacy_support_core_ui",
     "libs/androidx_legacy_legacy_support_core_utils",
+    "libs/androidx_legacy_legacy_support_v13",
+    "libs/androidx_legacy_legacy_support_v4",
     "libs/androidx_lifecycle_lifecycle_common",
     "libs/androidx_lifecycle_lifecycle_common_java8",
     "libs/androidx_lifecycle_lifecycle_livedata",

diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/build.gradle
@@ -51,6 +51,10 @@ dependencies {
     def androidXSupportLibVersion = '1.0.0'
     compile "androidx.core:core:1.1.0"
     compile "androidx.activity:activity:1.1.0"
+    compile "androidx.legacy:legacy-support-core-ui:${androidXSupportLibVersion}"
+    compile "androidx.legacy:legacy-support-core-utils:${androidXSupportLibVersion}"
+    compile "androidx.legacy:legacy-support-v4:${androidXSupportLibVersion}"
+    compile "androidx.legacy:legacy-support-v13:${androidXSupportLibVersion}"
     compile "androidx.annotation:annotation:1.1.0"
     compile "androidx.appcompat:appcompat:1.2.0-beta01"
     compile "androidx.appcompat:appcompat-resources:1.2.0-beta01"

diff --git a/third_party/android_swipe_refresh/BUILD.gn b/third_party/android_swipe_refresh/BUILD.gn
@@ -16,5 +16,6 @@ android_library("android_swipe_refresh_java") {
   deps = [
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_interpolator_interpolator_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
   ]
 }