Commit bfa6a95a authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

Remove unused com_android_support targets in //third_party/android_deps

This CL removes the following targets:
com.android.support:appcompat-v7
com.android.support:gridlayout-v7
com.android.support:mediarouter-v7
com.android.support:recyclerview-v7
com.android.support:cardview-v7
com.android.support:preference-v7
com.android.support:support-v13
com.android.support:preference-leanback-v17
com.android.support:support-annotations
com.android.support:design

BUG=None

Change-Id: Ib18eddd8e5341150057127ad215a6fe3cc66e2ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2425010
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810478}
parent 0536e386
...@@ -1154,12 +1154,6 @@ android_library("chrome_test_java") { ...@@ -1154,12 +1154,6 @@ android_library("chrome_test_java") {
"//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_test_runner_java", "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:androidx_viewpager_viewpager_java", "//third_party/android_deps:androidx_viewpager_viewpager_java",
"//url:gurl_javatests",
"//url:origin_java",
# TODO (bjoyce): Remove recyclerview_v7 when espresso tests are migrated
# to androidx.
"//third_party/android_deps:com_android_support_recyclerview_v7_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:espresso_java", "//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java", "//third_party/android_deps:material_design_java",
...@@ -1184,6 +1178,8 @@ android_library("chrome_test_java") { ...@@ -1184,6 +1178,8 @@ android_library("chrome_test_java") {
"//ui/android:ui_javatests", "//ui/android:ui_javatests",
"//ui/base/mojom:mojom_java", "//ui/base/mojom:mojom_java",
"//url:gurl_java", "//url:gurl_java",
"//url:gurl_javatests",
"//url:origin_java",
"//url/mojom:url_mojom_gurl_java", "//url/mojom:url_mojom_gurl_java",
] ]
......
...@@ -109,7 +109,6 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") { ...@@ -109,7 +109,6 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
"//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_test_runner_java", "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:com_android_support_drawerlayout_java", "//third_party/android_deps:com_android_support_drawerlayout_java",
"//third_party/android_deps:com_android_support_recyclerview_v7_java",
"//third_party/android_deps:espresso_java", "//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:runner_java", "//third_party/android_support_test_runner:runner_java",
"//third_party/guava:guava_android_java", "//third_party/guava:guava_android_java",
......
This diff is collapsed.
...@@ -77,30 +77,18 @@ ...@@ -77,30 +77,18 @@
"libs/androidx_window_window", "libs/androidx_window_window",
"libs/backport_util_concurrent_backport_util_concurrent", "libs/backport_util_concurrent_backport_util_concurrent",
"libs/classworlds_classworlds", "libs/classworlds_classworlds",
"libs/com_android_support_animated_vector_drawable",
"libs/com_android_support_appcompat_v7",
"libs/com_android_support_asynclayoutinflater", "libs/com_android_support_asynclayoutinflater",
"libs/com_android_support_cardview_v7",
"libs/com_android_support_collections", "libs/com_android_support_collections",
"libs/com_android_support_coordinatorlayout", "libs/com_android_support_coordinatorlayout",
"libs/com_android_support_cursoradapter", "libs/com_android_support_cursoradapter",
"libs/com_android_support_customview", "libs/com_android_support_customview",
"libs/com_android_support_design",
"libs/com_android_support_documentfile", "libs/com_android_support_documentfile",
"libs/com_android_support_drawerlayout", "libs/com_android_support_drawerlayout",
"libs/com_android_support_gridlayout_v7",
"libs/com_android_support_interpolator", "libs/com_android_support_interpolator",
"libs/com_android_support_leanback_v17",
"libs/com_android_support_loader", "libs/com_android_support_loader",
"libs/com_android_support_localbroadcastmanager", "libs/com_android_support_localbroadcastmanager",
"libs/com_android_support_mediarouter_v7",
"libs/com_android_support_multidex", "libs/com_android_support_multidex",
"libs/com_android_support_palette_v7",
"libs/com_android_support_preference_leanback_v17",
"libs/com_android_support_preference_v14",
"libs/com_android_support_preference_v7",
"libs/com_android_support_print", "libs/com_android_support_print",
"libs/com_android_support_recyclerview_v7",
"libs/com_android_support_slidingpanelayout", "libs/com_android_support_slidingpanelayout",
"libs/com_android_support_support_annotations", "libs/com_android_support_support_annotations",
"libs/com_android_support_support_compat", "libs/com_android_support_support_compat",
...@@ -108,11 +96,8 @@ ...@@ -108,11 +96,8 @@
"libs/com_android_support_support_core_utils", "libs/com_android_support_support_core_utils",
"libs/com_android_support_support_fragment", "libs/com_android_support_support_fragment",
"libs/com_android_support_support_media_compat", "libs/com_android_support_support_media_compat",
"libs/com_android_support_support_v13",
"libs/com_android_support_support_v4", "libs/com_android_support_support_v4",
"libs/com_android_support_support_vector_drawable",
"libs/com_android_support_swiperefreshlayout", "libs/com_android_support_swiperefreshlayout",
"libs/com_android_support_transition",
"libs/com_android_support_versionedparcelable", "libs/com_android_support_versionedparcelable",
"libs/com_android_support_viewpager", "libs/com_android_support_viewpager",
"libs/com_android_tools_build_jetifier_jetifier_core", "libs/com_android_tools_build_jetifier_jetifier_core",
......
...@@ -135,20 +135,7 @@ dependencies { ...@@ -135,20 +135,7 @@ dependencies {
compile "com.android.support:support-core-utils:${supportLibVersion}" compile "com.android.support:support-core-utils:${supportLibVersion}"
compile "com.android.support:support-fragment:${supportLibVersion}" compile "com.android.support:support-fragment:${supportLibVersion}"
// Support v7 libraries
compile "com.android.support:appcompat-v7:${supportLibVersion}"
compile "com.android.support:gridlayout-v7:${supportLibVersion}"
compile "com.android.support:mediarouter-v7:${supportLibVersion}"
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
compile "com.android.support:cardview-v7:${supportLibVersion}"
compile "com.android.support:preference-v7:${supportLibVersion}"
compile "com.android.support:support-v13:${supportLibVersion}"
compile "com.android.support:preference-leanback-v17:${supportLibVersion}"
compile "com.android.support:support-annotations:${supportLibVersion}" compile "com.android.support:support-annotations:${supportLibVersion}"
compile "com.android.support:design:${supportLibVersion}"
compile "com.android.support:asynclayoutinflater:${supportLibVersion}" compile "com.android.support:asynclayoutinflater:${supportLibVersion}"
compile "com.android.support:collections:${supportLibVersion}" compile "com.android.support:collections:${supportLibVersion}"
......
...@@ -322,10 +322,6 @@ class BuildConfigGenerator extends DefaultTask { ...@@ -322,10 +322,6 @@ class BuildConfigGenerator extends DefaultTask {
case 'androidx_test_uiautomator_uiautomator': case 'androidx_test_uiautomator_uiautomator':
sb.append(' deps = [":androidx_test_runner_java"]\n') sb.append(' deps = [":androidx_test_runner_java"]\n')
break break
case 'com_android_support_mediarouter_v7':
sb.append(' # https://crbug.com/1000382\n')
sb.append(' proguard_configs = ["support_mediarouter.flags"]\n')
break
case 'androidx_mediarouter_mediarouter': case 'androidx_mediarouter_mediarouter':
sb.append(' # https://crbug.com/1000382\n') sb.append(' # https://crbug.com/1000382\n')
sb.append(' proguard_configs = ["androidx_mediarouter.flags"]\n') sb.append(' proguard_configs = ["androidx_mediarouter.flags"]\n')
...@@ -350,7 +346,6 @@ class BuildConfigGenerator extends DefaultTask { ...@@ -350,7 +346,6 @@ class BuildConfigGenerator extends DefaultTask {
break break
case 'com_android_support_coordinatorlayout': case 'com_android_support_coordinatorlayout':
case 'androidx_coordinatorlayout_coordinatorlayout': case 'androidx_coordinatorlayout_coordinatorlayout':
case 'com_android_support_design':
sb.append('\n') sb.append('\n')
sb.append(' # Reduce binary size. https:crbug.com/954584\n') sb.append(' # Reduce binary size. https:crbug.com/954584\n')
sb.append(' ignore_proguard_configs = true\n') sb.append(' ignore_proguard_configs = true\n')
...@@ -460,8 +455,6 @@ class BuildConfigGenerator extends DefaultTask { ...@@ -460,8 +455,6 @@ class BuildConfigGenerator extends DefaultTask {
| ] | ]
| |
|""".stripMargin()) |""".stripMargin())
// fallthrough
case 'com_android_support_preference_v7':
// Replace broad library -keep rules with a more limited set in // Replace broad library -keep rules with a more limited set in
// chrome/android/java/proguard.flags instead. // chrome/android/java/proguard.flags instead.
sb.append(' ignore_proguard_configs = true\n') sb.append(' ignore_proguard_configs = true\n')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment