Commit 8f6e55fd authored by Simeon Anfinrud's avatar Simeon Anfinrud Committed by Commit Bot

[android_deps] Re-add com_android_support_design_java.

Chromecast internal code was making use of this.

Added an exhaustive list of internal chromecast's android
dependencies that should be checked by gn gen to prevent similar
situations from arising in the future.

Bug: Internal b/169779668
Test: build internal chromecast apk with this patch and
      chromium-review.googlesource.com/2425010 cherry-picked.

Change-Id: I9c32af013a718e44f1f79e7465f4d6c2c185c671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453433Reviewed-by: default avatarLuke Halliwell (slow) <halliwell@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Simeon Anfinrud <sanfin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814706}
parent 4df0e8ba
...@@ -44,3 +44,36 @@ cast_shared_library("libcast_shell_android") { ...@@ -44,3 +44,36 @@ cast_shared_library("libcast_shell_android") {
] ]
} }
} }
# These are all known //third_party/android_deps targets that chromecast
# internal code depends on. Reference these targets so if anyone wants to
# remove these targets upstream, they need to at least add someone from
# //chromecast OWNERS as a reviewer to make sure it's safe.
#
# This list was generated from chromecast/internal using:
#
# find | grep BUILD.gn | xargs grep -hi '//third_party/android_deps:' | \
# grep -v "deps =" | sed 's/ *//g' | sort | uniq
group("internal_android_deps") {
testonly = true
public_deps = [
"//third_party/android_deps:android_support_v4_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_appcompat_appcompat_java",
"//third_party/android_deps:androidx_leanback_leanback_preference_java",
"//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
"//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
"//third_party/android_deps:androidx_mediarouter_mediarouter_java",
"//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_slice_slice_builders_java",
"//third_party/android_deps:androidx_slice_slice_core_java",
"//third_party/android_deps:androidx_test_core_java",
"//third_party/android_deps:androidx_tvprovider_tvprovider_java",
"//third_party/android_deps:com_android_support_design_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
]
}
...@@ -821,7 +821,10 @@ android_aar_prebuilt("androidx_webkit_webkit_java") { ...@@ -821,7 +821,10 @@ android_aar_prebuilt("androidx_webkit_webkit_java") {
":androidx_core_core_java", ":androidx_core_core_java",
] ]
resource_overlay = true resource_overlay = true
visibility = [ "//android_webview/tools/system_webview_shell:*" ] visibility = [
"//android_webview/tools/system_webview_shell:*",
"//third_party/android_deps:*",
]
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
...@@ -883,6 +886,24 @@ android_aar_prebuilt("com_android_support_customview_java") { ...@@ -883,6 +886,24 @@ android_aar_prebuilt("com_android_support_customview_java") {
resource_overlay = true resource_overlay = true
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_design_java") {
aar_path = "libs/com_android_support_design/design-28.0.0.aar"
info_path = "libs/com_android_support_design/com_android_support_design.info"
deps = [
":com_android_support_appcompat_v7_java",
":com_android_support_cardview_v7_java",
":com_android_support_recyclerview_v7_java",
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
":com_android_support_support_core_ui_java",
":com_android_support_support_core_utils_java",
":com_android_support_support_fragment_java",
":com_android_support_transition_java",
]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_drawerlayout_java") { android_aar_prebuilt("com_android_support_drawerlayout_java") {
aar_path = "libs/com_android_support_drawerlayout/drawerlayout-28.0.0.aar" aar_path = "libs/com_android_support_drawerlayout/drawerlayout-28.0.0.aar"
...@@ -1302,6 +1323,10 @@ android_aar_prebuilt("com_google_android_material_material_java") { ...@@ -1302,6 +1323,10 @@ android_aar_prebuilt("com_google_android_material_material_java") {
aar_path = aar_path =
"libs/com_google_android_material_material/material-1.2.0-alpha06.aar" "libs/com_google_android_material_material/material-1.2.0-alpha06.aar"
info_path = "libs/com_google_android_material_material/com_google_android_material_material.info" info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
# Material Design is pulled in via Doubledown, thus this target should not
# be directly depended on. Please use :material_design_java instead.
visibility = [ ":*" ]
deps = [ deps = [
":androidx_annotation_annotation_experimental_java", ":androidx_annotation_annotation_experimental_java",
":androidx_annotation_annotation_java", ":androidx_annotation_annotation_java",
...@@ -1319,10 +1344,6 @@ android_aar_prebuilt("com_google_android_material_material_java") { ...@@ -1319,10 +1344,6 @@ android_aar_prebuilt("com_google_android_material_material_java") {
# Reduce binary size. https:crbug.com/954584 # Reduce binary size. https:crbug.com/954584
ignore_proguard_configs = true ignore_proguard_configs = true
# Material Design is pulled in via Doubledown, thus this target should not
# be directly depended on. Please use :material_design_java instead.
visibility = [ ":*" ]
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
...@@ -1991,6 +2012,54 @@ java_prebuilt("classworlds_classworlds_java") { ...@@ -1991,6 +2012,54 @@ java_prebuilt("classworlds_classworlds_java") {
testonly = true testonly = true
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_animated_vector_drawable_java") {
aar_path = "libs/com_android_support_animated_vector_drawable/animated-vector-drawable-28.0.0.aar"
info_path = "libs/com_android_support_animated_vector_drawable/com_android_support_animated_vector_drawable.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [
":com_android_support_support_core_ui_java",
":com_android_support_support_vector_drawable_java",
]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_appcompat_v7_java") {
aar_path = "libs/com_android_support_appcompat_v7/appcompat-v7-28.0.0.aar"
info_path = "libs/com_android_support_appcompat_v7/com_android_support_appcompat_v7.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [
":com_android_support_animated_vector_drawable_java",
":com_android_support_collections_java",
":com_android_support_cursoradapter_java",
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
":com_android_support_support_core_utils_java",
":com_android_support_support_fragment_java",
":com_android_support_support_vector_drawable_java",
]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_cardview_v7_java") {
aar_path = "libs/com_android_support_cardview_v7/cardview-v7-28.0.0.aar"
info_path = "libs/com_android_support_cardview_v7/com_android_support_cardview_v7.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_support_annotations_java" ]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_cursoradapter_java") { android_aar_prebuilt("com_android_support_cursoradapter_java") {
aar_path = "libs/com_android_support_cursoradapter/cursoradapter-28.0.0.aar" aar_path = "libs/com_android_support_cursoradapter/cursoradapter-28.0.0.aar"
...@@ -2044,6 +2113,23 @@ android_aar_prebuilt("com_android_support_print_java") { ...@@ -2044,6 +2113,23 @@ android_aar_prebuilt("com_android_support_print_java") {
resource_overlay = true resource_overlay = true
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_recyclerview_v7_java") {
aar_path =
"libs/com_android_support_recyclerview_v7/recyclerview-v7-28.0.0.aar"
info_path = "libs/com_android_support_recyclerview_v7/com_android_support_recyclerview_v7.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
":com_android_support_support_core_ui_java",
]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_slidingpanelayout_java") { android_aar_prebuilt("com_android_support_slidingpanelayout_java") {
aar_path = aar_path =
...@@ -2080,6 +2166,39 @@ android_aar_prebuilt("com_android_support_support_media_compat_java") { ...@@ -2080,6 +2166,39 @@ android_aar_prebuilt("com_android_support_support_media_compat_java") {
ignore_aidl = true ignore_aidl = true
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_support_vector_drawable_java") {
aar_path = "libs/com_android_support_support_vector_drawable/support-vector-drawable-28.0.0.aar"
info_path = "libs/com_android_support_support_vector_drawable/com_android_support_support_vector_drawable.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
resource_overlay = true
create_srcjar = false
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_transition_java") {
aar_path = "libs/com_android_support_transition/transition-28.0.0.aar"
info_path =
"libs/com_android_support_transition/com_android_support_transition.info"
# To remove visibility constraint, add this dependency to
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
resource_overlay = true
deps += [ ":com_android_support_support_fragment_java" ]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_versionedparcelable_java") { android_aar_prebuilt("com_android_support_versionedparcelable_java") {
aar_path = "libs/com_android_support_versionedparcelable/versionedparcelable-28.0.0.aar" aar_path = "libs/com_android_support_versionedparcelable/versionedparcelable-28.0.0.aar"
......
...@@ -77,11 +77,15 @@ ...@@ -77,11 +77,15 @@
"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_interpolator", "libs/com_android_support_interpolator",
...@@ -89,6 +93,7 @@ ...@@ -89,6 +93,7 @@
"libs/com_android_support_localbroadcastmanager", "libs/com_android_support_localbroadcastmanager",
"libs/com_android_support_multidex", "libs/com_android_support_multidex",
"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",
...@@ -97,7 +102,9 @@ ...@@ -97,7 +102,9 @@
"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_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",
......
...@@ -136,6 +136,7 @@ dependencies { ...@@ -136,6 +136,7 @@ dependencies {
compile "com.android.support:support-fragment:${supportLibVersion}" compile "com.android.support:support-fragment:${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}"
......
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