Skip to content

GitLab

T
tangled
Commit 855e8413 authored by Nicolas Dossou-gbete's avatar Nicolas Dossou-gbete Committed by Commit Bot
Browse files
Options

🔧 Cleanup redundant support lib targets 

Removes unnecessary support library target aliases and their
usage.

Bug: 807641
Change-Id: I957d0490eedd4202a3f460469bb2b37771fafbcc
Reviewed-on: https://chromium-review.googlesource.com/895450Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarLambros Lambrou <lambroslambrou@chromium.org>
Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533668}
parent 11f9b4b3
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 73 deletions
build/secondary/third_party/android_tools/BUILD.gn
View file @ 855e8413
......@@ -64,38 +64,18 @@ support_lib_alias("android_support_core_utils_java") {
}
support_lib_alias("android_support_design_java") {
}
support_lib_alias("android_support_fragment_java") {
}
support_lib_alias("android_support_media_compat_java") {
}
support_lib_alias("android_support_transition_java") {
}
support_lib_alias("android_support_v4_java") {
}
support_lib_alias("android_support_v7_appcompat_java") {
}
support_lib_alias("android_support_v7_appcompat_java_internal") {
}
support_lib_alias("android_support_v7_gridlayout_java") {
}
support_lib_alias("android_support_v7_mediarouter_java") {
}
support_lib_alias("android_support_v7_palette_java") {
}
support_lib_alias("android_support_v7_preference_java") {
}
support_lib_alias("android_support_v7_recyclerview_java") {
}
support_lib_alias("android_support_v13_java") {
}
support_lib_alias("android_support_v14_preference_java") {
}
support_lib_alias("android_support_v17_leanback_java") {
}
support_lib_alias("android_support_v17_preference_java") {
}
support_lib_alias("android_support_vector_drawable_java") {
}
# TODO(dgn): Use the POM files instead of hardcoding the dependencies.
gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/google/android/gms"
......
build/secondary/third_party/android_tools/support/BUILD.gn
View file @ 855e8413
......@@ -4,10 +4,7 @@
import("//build/config/android/rules.gni")
visibility = [
":*",
"//third_party/android_tools:*",
]
visibility = [ ":*" ]
lib_version = "27.0.0"
lib_path = "//third_party/android_tools/sdk/extras/android/m2repository/com/android/support"
......@@ -19,15 +16,18 @@ build_file_dir = "//build/secondary/third_party/android_tools/support"
android_library("android_support_chromium_java") {
testonly = true
java_files = [ "//third_party/android_tools/sdk/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
visibility += [ "//third_party/android_tools:*" ]
}
android_java_prebuilt("android_gcm_java") {
jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
visibility += [ "//third_party/android_tools:*" ]
}
android_java_prebuilt("emma_device_java") {
jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
include_java_resources = true
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_design_java") {
......@@ -40,6 +40,7 @@ android_aar_prebuilt("android_support_design_java") {
_lib_name = "design"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_transition_java") {
......@@ -58,11 +59,13 @@ android_aar_prebuilt("android_support_cardview_java") {
_lib_name = "cardview-v7"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_multidex_java") {
aar_path = "$lib_path/multidex/1.0.1/multidex-1.0.1.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
......@@ -73,6 +76,7 @@ android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
":android_arch_lifecycle_common_java",
":android_support_annotations_java",
]
visibility += [ "//third_party/android_tools:*" ]
}
android_java_prebuilt("android_arch_lifecycle_common_java") {
......@@ -81,6 +85,7 @@ android_java_prebuilt("android_arch_lifecycle_common_java") {
deps = [
":android_support_annotations_java",
]
visibility += [ "//third_party/android_tools:*" ]
}
android_java_prebuilt("android_arch_core_common_java") {
......@@ -94,6 +99,7 @@ android_java_prebuilt("android_arch_core_common_java") {
android_java_prebuilt("android_support_annotations_java") {
_lib_name = "support-annotations"
jar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.jar"
visibility += [ "//third_party/android_tools:*" ]
}
java_group("android_support_v4_java") {
......@@ -104,6 +110,7 @@ java_group("android_support_v4_java") {
":android_support_fragment_java",
":android_support_media_compat_java",
]
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_compat_java") {
......@@ -115,6 +122,7 @@ android_aar_prebuilt("android_support_compat_java") {
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
ignore_aidl = true # We don't appear to need these currently.
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_core_ui_java") {
......@@ -124,6 +132,7 @@ android_aar_prebuilt("android_support_core_ui_java") {
_lib_name = "support-core-ui"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_core_utils_java") {
......@@ -133,6 +142,7 @@ android_aar_prebuilt("android_support_core_utils_java") {
_lib_name = "support-core-utils"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_fragment_java") {
......@@ -164,6 +174,7 @@ android_aar_prebuilt("android_support_v13_java") {
_lib_name = "support-v13"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_vector_drawable_java") {
......@@ -201,6 +212,7 @@ java_group("android_support_v7_appcompat_java") {
":android_support_v7_appcompat_java_internal",
":android_support_vector_drawable_java",
]
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_v7_gridlayout_java") {
......@@ -211,6 +223,7 @@ android_aar_prebuilt("android_support_v7_gridlayout_java") {
_lib_name = "gridlayout-v7"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_v7_mediarouter_java") {
......@@ -221,6 +234,7 @@ android_aar_prebuilt("android_support_v7_mediarouter_java") {
_lib_name = "mediarouter-v7"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_v7_recyclerview_java") {
......@@ -232,6 +246,7 @@ android_aar_prebuilt("android_support_v7_recyclerview_java") {
_lib_name = "recyclerview-v7"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
visibility += [ "//third_party/android_tools:*" ]
}
android_aar_prebuilt("android_support_v7_palette_java") {
......@@ -243,50 +258,3 @@ android_aar_prebuilt("android_support_v7_palette_java") {
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
}
android_aar_prebuilt("android_support_v7_preference_java") {
deps = [
":android_support_v4_java",
":android_support_v7_appcompat_java",
":android_support_v7_recyclerview_java",
]
_lib_name = "preference-v7"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
}
android_aar_prebuilt("android_support_v14_preference_java") {
deps = [
":android_support_v4_java",
":android_support_v7_appcompat_java",
":android_support_v7_preference_java",
":android_support_v7_recyclerview_java",
]
_lib_name = "preference-v14"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
}
android_aar_prebuilt("android_support_v17_leanback_java") {
deps = [
":android_support_v4_java",
":android_support_v7_recyclerview_java",
]
_lib_name = "leanback-v17"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
}
android_aar_prebuilt("android_support_v17_preference_java") {
deps = [
":android_support_v14_preference_java",
":android_support_v17_leanback_java",
":android_support_v4_java",
":android_support_v7_appcompat_java",
":android_support_v7_preference_java",
":android_support_v7_recyclerview_java",
]
_lib_name = "preference-leanback-v17"
aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
info_path = "$build_file_dir/$target_name.info"
}
remoting/android/client_java_tmpl.gni
View file @ 855e8413
......@@ -83,8 +83,6 @@ template("remoting_android_client_java_tmpl") {
"//remoting/android:remoting_apk_manifest",
"//third_party/android_tools:android_arch_lifecycle_common_java",
"//third_party/android_tools:android_support_annotations_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_utils_java",
......
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