Refine the usage of support-v4 library

Support-v4 is now splitted into multiple subtargets. This CL makes the Chromium code to only compile with the minimum set of dependency. BUG=670007 Review-Url: https://codereview.chromium.org/2544623002 Cr-Commit-Position: refs/heads/master@{#436669}
Denger-Network · Dec 6, 2016 · 7a88406 · 7a88406
1 parent b025c5c
commit 7a88406
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/chromecast/browser/android/BUILD.gn b/chromecast/browser/android/BUILD.gn
@@ -48,7 +48,7 @@ android_library("cast_shell_java") {
     "//net/android:net_java",
 
     # TODO(slan): We may need to pass this in as a parameter.
-    "//third_party/android_tools:android_support_v4_java",
+    "//third_party/android_tools:android_support_core_utils_java",
     "//ui/android:ui_java",
   ]
 }
diff --git a/components/variations/android/BUILD.gn b/components/variations/android/BUILD.gn
@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("variations_java") {
   deps = [
     "//base:base_java",
-    "//third_party/android_tools:android_support_v4_java",
+    "//third_party/android_tools:android_support_core_utils_java",
   ]
   java_files = [
     "java/src/org/chromium/components/variations/VariationsAssociatedData.java",

diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
@@ -80,7 +80,8 @@ template("remoting_android_client_java_tmpl") {
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
       "//third_party/android_tools:android_support_annotations_java",
-      "//third_party/android_tools:android_support_v4_java",
+      "//third_party/android_tools:android_support_compat_java",
+      "//third_party/android_tools:android_support_core_ui_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//third_party/android_tools:android_support_v7_mediarouter_java",
       "//ui/android:ui_java",

diff --git a/third_party/android_swipe_refresh/BUILD.gn b/third_party/android_swipe_refresh/BUILD.gn
@@ -14,6 +14,6 @@ android_library("android_swipe_refresh_java") {
     "java/src/org/chromium/third_party/android/swiperefresh/SwipeRefreshLayout.java",
   ]
   deps = [
-    "//third_party/android_tools:android_support_v4_java",
+    "//third_party/android_tools:android_support_core_ui_java",
   ]
 }
diff --git a/third_party/custom_tabs_client/BUILD.gn b/third_party/custom_tabs_client/BUILD.gn
@@ -53,7 +53,7 @@ android_library("custom_tabs_support_java") {
   ]
   deps = [
     "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_v4_java",
+    "//third_party/android_tools:android_support_compat_java",
   ]
   srcjar_deps = [ ":chrome_custom_tabs_service_aidl" ]
   chromium_code = true

diff --git a/tools/android/audio_focus_grabber/BUILD.gn b/tools/android/audio_focus_grabber/BUILD.gn
@@ -12,7 +12,7 @@ android_apk("audio_focus_grabber_apk") {
   deps = [
     ":audio_focus_grabber_apk_resources",
     "//base:base_java",
-    "//third_party/android_tools:android_support_v4_java",
+    "//third_party/android_tools:android_support_compat_java",
   ]
 
   java_files = [