Skip to content

GitLab

T
tangled
Commit ff2bf066 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot
Browse files
Options

Add skip_jetitfy variable to targets. 

Bug: 1021634,896775
Change-Id: I10ba6702db5774af270354cb4ee3b94953aa3bdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015734Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#735795}
parent bfdd67e0
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 11 deletions
build/config/android/internal_rules.gni
View file @ ff2bf066
......@@ -1469,6 +1469,7 @@ if (enable_java_templates) {
# from the final .jar file.
# jar_included_patterns: OPtional list of .class file patterns to include
# in the final .jar file. jar_excluded_patterns take precedence over this.
# skip_jetify: A boolean on whether to skip jetifying or not.
# strip_resource_classes:
# deps:
# java_files:
......@@ -1501,6 +1502,10 @@ if (enable_java_templates) {
_desugar = defined(invoker.supports_android) && invoker.supports_android
_jacoco_instrument = invoker.jacoco_instrument
_skip_jetify = defined(invoker.skip_jetify) && invoker.skip_jetify
# TODO(bjoyce): Remove once Androidx with jetifying lands.
not_needed([ "_skip_jetify" ])
_enable_bytecode_rewriter =
_enable_assert || _enable_custom_resources || _enable_thread_annotations
......@@ -3367,6 +3372,7 @@ if (enable_java_templates) {
"enable_bytecode_rewriter",
"jar_excluded_patterns",
"jar_included_patterns",
"skip_jetify",
])
is_prebuilt = _is_prebuilt
supports_android = _supports_android
......
build/config/android/rules.gni
View file @ ff2bf066
......@@ -4275,6 +4275,7 @@ if (enable_java_templates) {
"deps",
"input_jars_paths",
"proguard_configs",
"skip_jetify",
])
if (!defined(deps)) {
deps = []
......
third_party/android_deps/BUILD.gn
View file @ ff2bf066
......@@ -58,6 +58,7 @@ java_prebuilt("android_arch_lifecycle_common_java") {
output_name = "android_arch_lifecycle_common"
supports_android = true
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -69,6 +70,7 @@ java_prebuilt("android_arch_lifecycle_common_java8_java") {
":android_arch_lifecycle_common_java",
":com_android_support_support_annotations_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -81,6 +83,7 @@ android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
":android_arch_lifecycle_common_java",
":com_android_support_support_annotations_java",
]
skip_jetify = true
# https://crbug.com/887942#c1
ignore_proguard_configs = true
......@@ -91,6 +94,7 @@ android_aar_prebuilt("android_arch_lifecycle_viewmodel_java") {
aar_path = "libs/android_arch_lifecycle_viewmodel/viewmodel-1.1.1.aar"
info_path = "libs/android_arch_lifecycle_viewmodel/android_arch_lifecycle_viewmodel.info"
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
# https://crbug.com/887942#c1
ignore_proguard_configs = true
......@@ -101,6 +105,7 @@ java_prebuilt("androidx_annotation_annotation_java") {
jar_path = "libs/androidx_annotation_annotation/annotation-1.0.0.jar"
output_name = "androidx_annotation_annotation"
supports_android = true
skip_jetify = true
# https://crbug.com/989505
jar_excluded_patterns = [ "META-INF/proguard/*" ]
......@@ -121,6 +126,7 @@ android_aar_prebuilt("androidx_appcompat_appcompat_java") {
":androidx_vectordrawable_vectordrawable_animated_java",
":androidx_vectordrawable_vectordrawable_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -131,6 +137,7 @@ android_aar_prebuilt("androidx_asynclayoutinflater_asynclayoutinflater_java") {
":androidx_annotation_annotation_java",
":androidx_core_core_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -138,6 +145,7 @@ android_aar_prebuilt("androidx_cardview_cardview_java") {
aar_path = "libs/androidx_cardview_cardview/cardview-1.0.0.aar"
info_path = "libs/androidx_cardview_cardview/androidx_cardview_cardview.info"
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -146,6 +154,7 @@ java_prebuilt("androidx_collection_collection_java") {
output_name = "androidx_collection_collection"
supports_android = true
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -158,6 +167,7 @@ java_prebuilt("androidx_concurrent_concurrent_futures_java") {
":androidx_annotation_annotation_java",
":com_google_guava_listenablefuture_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -169,6 +179,7 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
":androidx_core_core_java",
":androidx_customview_customview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -181,6 +192,7 @@ android_aar_prebuilt("androidx_core_core_java") {
":androidx_lifecycle_lifecycle_runtime_java",
":androidx_versionedparcelable_versionedparcelable_java",
]
skip_jetify = true
ignore_aidl = true
}
......@@ -193,6 +205,7 @@ android_aar_prebuilt("androidx_customview_customview_java") {
":androidx_annotation_annotation_java",
":androidx_core_core_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -204,6 +217,7 @@ android_aar_prebuilt("androidx_drawerlayout_drawerlayout_java") {
":androidx_core_core_java",
":androidx_customview_customview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -215,6 +229,7 @@ android_aar_prebuilt("androidx_gridlayout_gridlayout_java") {
":androidx_core_core_java",
":androidx_legacy_legacy_support_core_ui_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -222,6 +237,7 @@ android_aar_prebuilt("androidx_interpolator_interpolator_java") {
aar_path = "libs/androidx_interpolator_interpolator/interpolator-1.0.0.aar"
info_path = "libs/androidx_interpolator_interpolator/androidx_interpolator_interpolator.info"
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -237,6 +253,7 @@ android_aar_prebuilt("androidx_leanback_leanback_preference_java") {
":androidx_preference_preference_java",
":androidx_recyclerview_recyclerview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -257,6 +274,7 @@ android_aar_prebuilt("androidx_legacy_legacy_support_core_ui_java") {
":androidx_swiperefreshlayout_swiperefreshlayout_java",
":androidx_viewpager_viewpager_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -271,6 +289,7 @@ android_aar_prebuilt("androidx_legacy_legacy_support_core_utils_java") {
":androidx_localbroadcastmanager_localbroadcastmanager_java",
":androidx_print_print_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -279,6 +298,7 @@ android_aar_prebuilt("androidx_legacy_legacy_support_v13_java") {
"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" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -293,6 +313,7 @@ android_aar_prebuilt("androidx_legacy_legacy_support_v4_java") {
":androidx_legacy_legacy_support_core_utils_java",
":androidx_media_media_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -302,6 +323,7 @@ java_prebuilt("androidx_lifecycle_lifecycle_common_java") {
output_name = "androidx_lifecycle_lifecycle_common"
supports_android = true
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -313,6 +335,7 @@ java_prebuilt("androidx_lifecycle_lifecycle_common_java8_java") {
":androidx_annotation_annotation_java",
":androidx_lifecycle_lifecycle_common_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -325,6 +348,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_runtime_java") {
":androidx_arch_core_core_common_java",
":androidx_lifecycle_lifecycle_common_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -332,6 +356,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_java") {
aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.0.0.aar"
info_path = "libs/androidx_lifecycle_lifecycle_viewmodel/androidx_lifecycle_lifecycle_viewmodel.info"
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -340,6 +365,7 @@ android_aar_prebuilt(
aar_path = "libs/androidx_localbroadcastmanager_localbroadcastmanager/localbroadcastmanager-1.0.0.aar"
info_path = "libs/androidx_localbroadcastmanager_localbroadcastmanager/androidx_localbroadcastmanager_localbroadcastmanager.info"
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -352,6 +378,7 @@ android_aar_prebuilt("androidx_mediarouter_mediarouter_java") {
":androidx_palette_palette_java",
":androidx_recyclerview_recyclerview_java",
]
skip_jetify = true
# https://crbug.com/1000382
proguard_configs = [ "androidx_mediarouter.flags" ]
......@@ -361,6 +388,7 @@ android_aar_prebuilt("androidx_mediarouter_mediarouter_java") {
android_aar_prebuilt("androidx_multidex_multidex_java") {
aar_path = "libs/androidx_multidex_multidex/multidex-2.0.0.aar"
info_path = "libs/androidx_multidex_multidex/androidx_multidex_multidex.info"
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -375,6 +403,7 @@ android_aar_prebuilt("androidx_preference_preference_java") {
":androidx_fragment_fragment_java",
":androidx_recyclerview_recyclerview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -386,6 +415,7 @@ android_aar_prebuilt("androidx_recyclerview_recyclerview_java") {
":androidx_core_core_java",
":androidx_legacy_legacy_support_core_ui_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -397,6 +427,7 @@ android_aar_prebuilt("androidx_swiperefreshlayout_swiperefreshlayout_java") {
":androidx_core_core_java",
":androidx_interpolator_interpolator_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -409,6 +440,7 @@ android_aar_prebuilt("androidx_test_core_java") {
":androidx_lifecycle_lifecycle_common_java",
":androidx_test_monitor_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -417,6 +449,7 @@ android_aar_prebuilt("androidx_test_ext_junit_java") {
info_path = "libs/androidx_test_ext_junit/androidx_test_ext_junit.info"
testonly = true
deps = [ "//third_party/junit:junit" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -425,6 +458,7 @@ android_aar_prebuilt("androidx_test_monitor_java") {
info_path = "libs/androidx_test_monitor/androidx_test_monitor.info"
testonly = true
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -433,6 +467,7 @@ android_aar_prebuilt("androidx_test_rules_java") {
info_path = "libs/androidx_test_rules/androidx_test_rules.info"
testonly = true
deps = [ ":androidx_test_runner_java" ]
skip_jetify = true
deps += [
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
......@@ -451,6 +486,7 @@ android_aar_prebuilt("androidx_test_runner_java") {
":net_sf_kxml_kxml2_java",
"//third_party/junit:junit",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -458,6 +494,7 @@ android_aar_prebuilt("androidx_test_uiautomator_uiautomator_java") {
aar_path = "libs/androidx_test_uiautomator_uiautomator/uiautomator-2.2.0.aar"
info_path = "libs/androidx_test_uiautomator_uiautomator/androidx_test_uiautomator_uiautomator.info"
testonly = true
skip_jetify = true
deps = [ ":androidx_test_runner_java" ]
}
......@@ -471,6 +508,7 @@ android_aar_prebuilt("androidx_viewpager_viewpager_java") {
":androidx_core_core_java",
":androidx_customview_customview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -487,6 +525,7 @@ android_aar_prebuilt("com_android_support_appcompat_v7_java") {
":com_android_support_support_fragment_java",
":com_android_support_support_vector_drawable_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -497,6 +536,7 @@ android_aar_prebuilt("com_android_support_asynclayoutinflater_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -504,6 +544,7 @@ 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"
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -512,6 +553,7 @@ java_prebuilt("com_android_support_collections_java") {
output_name = "com_android_support_collections"
supports_android = true
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -524,6 +566,7 @@ android_aar_prebuilt("com_android_support_coordinatorlayout_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
# https:crbug.com/954584
ignore_proguard_configs = true
......@@ -538,6 +581,7 @@ android_aar_prebuilt("com_android_support_customview_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -555,6 +599,7 @@ android_aar_prebuilt("com_android_support_design_java") {
":com_android_support_support_fragment_java",
":com_android_support_transition_java",
]
skip_jetify = true
ignore_proguard_configs = true
}
......@@ -567,6 +612,7 @@ android_aar_prebuilt("com_android_support_drawerlayout_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -577,6 +623,7 @@ android_aar_prebuilt("com_android_support_gridlayout_v7_java") {
":com_android_support_support_compat_java",
":com_android_support_support_core_ui_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -584,6 +631,7 @@ android_aar_prebuilt("com_android_support_interpolator_java") {
aar_path = "libs/com_android_support_interpolator/interpolator-28.0.0.aar"
info_path = "libs/com_android_support_interpolator/com_android_support_interpolator.info"
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -591,6 +639,7 @@ android_aar_prebuilt("com_android_support_localbroadcastmanager_java") {
aar_path = "libs/com_android_support_localbroadcastmanager/localbroadcastmanager-28.0.0.aar"
info_path = "libs/com_android_support_localbroadcastmanager/com_android_support_localbroadcastmanager.info"
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -603,6 +652,7 @@ android_aar_prebuilt("com_android_support_mediarouter_v7_java") {
":com_android_support_recyclerview_v7_java",
":com_android_support_support_media_compat_java",
]
skip_jetify = true
# https://crbug.com/1000382
proguard_configs = [ "support_mediarouter.flags" ]
......@@ -613,6 +663,7 @@ android_aar_prebuilt("com_android_support_multidex_java") {
aar_path = "libs/com_android_support_multidex/multidex-1.0.0.aar"
info_path =
"libs/com_android_support_multidex/com_android_support_multidex.info"
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -627,6 +678,7 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
":com_android_support_preference_v7_java",
":com_android_support_recyclerview_v7_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -640,6 +692,7 @@ android_aar_prebuilt("com_android_support_preference_v7_java") {
":com_android_support_support_compat_java",
":com_android_support_support_fragment_java",
]
skip_jetify = true
ignore_proguard_configs = true
}
......@@ -653,6 +706,7 @@ android_aar_prebuilt("com_android_support_recyclerview_v7_java") {
":com_android_support_support_compat_java",
":com_android_support_support_core_ui_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -660,6 +714,7 @@ java_prebuilt("com_android_support_support_annotations_java") {
jar_path = "libs/com_android_support_support_annotations/support-annotations-28.0.0.jar"
output_name = "com_android_support_support_annotations"
supports_android = true
skip_jetify = true
# https://crbug.com/989505
jar_excluded_patterns = [ "META-INF/proguard/*" ]
......@@ -675,6 +730,7 @@ android_aar_prebuilt("com_android_support_support_compat_java") {
":com_android_support_support_annotations_java",
":com_android_support_versionedparcelable_java",
]
skip_jetify = true
ignore_aidl = true
}
......@@ -697,6 +753,7 @@ android_aar_prebuilt("com_android_support_support_core_ui_java") {
":com_android_support_swiperefreshlayout_java",
":com_android_support_viewpager_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -711,6 +768,7 @@ android_aar_prebuilt("com_android_support_support_core_utils_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -726,6 +784,7 @@ android_aar_prebuilt("com_android_support_support_fragment_java") {
":com_android_support_support_core_ui_java",
":com_android_support_support_core_utils_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -733,6 +792,7 @@ android_aar_prebuilt("com_android_support_support_v13_java") {
aar_path = "libs/com_android_support_support_v13/support-v13-28.0.0.aar"
info_path = "libs/com_android_support_support_v13/com_android_support_support_v13.info"
deps = [ ":com_android_support_support_v4_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -747,6 +807,7 @@ android_aar_prebuilt("com_android_support_support_v4_java") {
":com_android_support_support_fragment_java",
":com_android_support_support_media_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -758,6 +819,7 @@ android_aar_prebuilt("com_android_support_swiperefreshlayout_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -770,6 +832,7 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1170,6 +1233,7 @@ java_prebuilt("android_arch_core_common_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1184,6 +1248,7 @@ android_aar_prebuilt("android_arch_core_runtime_java") {
":android_arch_core_common_java",
":com_android_support_support_annotations_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1199,6 +1264,7 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_java") {
":android_arch_core_runtime_java",
":android_arch_lifecycle_livedata_core_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1214,6 +1280,7 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
":android_arch_core_runtime_java",
":android_arch_lifecycle_common_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1226,6 +1293,7 @@ java_prebuilt("androidx_arch_core_core_common_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1240,6 +1308,7 @@ android_aar_prebuilt("androidx_arch_core_core_runtime_java") {
":androidx_annotation_annotation_java",
":androidx_arch_core_core_common_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1251,6 +1320,7 @@ android_aar_prebuilt("androidx_cursoradapter_cursoradapter_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1262,6 +1332,7 @@ android_aar_prebuilt("androidx_documentfile_documentfile_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1280,6 +1351,7 @@ android_aar_prebuilt("androidx_fragment_fragment_java") {
":androidx_lifecycle_lifecycle_viewmodel_java",
":androidx_loader_loader_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1297,6 +1369,7 @@ android_aar_prebuilt("androidx_leanback_leanback_java") {
":androidx_media_media_java",
":androidx_recyclerview_recyclerview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1308,6 +1381,7 @@ android_aar_prebuilt("androidx_legacy_legacy_preference_v14_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":androidx_preference_preference_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1324,6 +1398,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_java") {
":androidx_arch_core_core_runtime_java",
":androidx_lifecycle_lifecycle_livedata_core_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1339,6 +1414,7 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_core_java") {
":androidx_arch_core_core_runtime_java",
":androidx_lifecycle_lifecycle_common_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1355,6 +1431,7 @@ android_aar_prebuilt("androidx_loader_loader_java") {
":androidx_lifecycle_lifecycle_livedata_java",
":androidx_lifecycle_lifecycle_viewmodel_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1370,6 +1447,7 @@ android_aar_prebuilt("androidx_media_media_java") {
":androidx_core_core_java",
":androidx_versionedparcelable_versionedparcelable_java",
]
skip_jetify = true
ignore_aidl = true
}
......@@ -1385,6 +1463,7 @@ android_aar_prebuilt("androidx_palette_palette_java") {
":androidx_core_core_java",
":androidx_legacy_legacy_support_core_utils_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1396,6 +1475,7 @@ android_aar_prebuilt("androidx_print_print_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":androidx_annotation_annotation_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1411,6 +1491,7 @@ android_aar_prebuilt("androidx_slidingpanelayout_slidingpanelayout_java") {
":androidx_core_core_java",
":androidx_customview_customview_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1426,6 +1507,7 @@ android_aar_prebuilt("androidx_transition_transition_java") {
":androidx_annotation_annotation_java",
":androidx_core_core_java",
]
skip_jetify = true
deps += [ ":androidx_fragment_fragment_java" ]
}
......@@ -1442,6 +1524,7 @@ android_aar_prebuilt("androidx_vectordrawable_vectordrawable_java") {
":androidx_annotation_annotation_java",
":androidx_core_core_java",
]
skip_jetify = true
create_srcjar = false
}
......@@ -1457,6 +1540,7 @@ android_aar_prebuilt("androidx_vectordrawable_vectordrawable_animated_java") {
":androidx_legacy_legacy_support_core_ui_java",
":androidx_vectordrawable_vectordrawable_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1471,6 +1555,7 @@ android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
":androidx_annotation_annotation_java",
":androidx_collection_collection_java",
]
skip_jetify = true
ignore_aidl = true
}
......@@ -1486,6 +1571,7 @@ android_aar_prebuilt("com_android_support_animated_vector_drawable_java") {
":com_android_support_support_core_ui_java",
":com_android_support_support_vector_drawable_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1497,6 +1583,7 @@ android_aar_prebuilt("com_android_support_cursoradapter_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1508,6 +1595,7 @@ android_aar_prebuilt("com_android_support_documentfile_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1525,6 +1613,7 @@ android_aar_prebuilt("com_android_support_leanback_v17_java") {
":com_android_support_support_fragment_java",
":com_android_support_support_media_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1541,6 +1630,7 @@ android_aar_prebuilt("com_android_support_loader_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1556,6 +1646,7 @@ android_aar_prebuilt("com_android_support_palette_v7_java") {
":com_android_support_support_compat_java",
":com_android_support_support_core_utils_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1567,6 +1658,7 @@ android_aar_prebuilt("com_android_support_preference_v14_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_preference_v7_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1578,6 +1670,7 @@ android_aar_prebuilt("com_android_support_print_java") {
# //third_party/android_deps/build.gradle.
visibility = [ ":*" ]
deps = [ ":com_android_support_support_annotations_java" ]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1594,6 +1687,7 @@ android_aar_prebuilt("com_android_support_slidingpanelayout_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......@@ -1609,6 +1703,7 @@ android_aar_prebuilt("com_android_support_support_media_compat_java") {
":com_android_support_support_compat_java",
":com_android_support_versionedparcelable_java",
]
skip_jetify = true
ignore_aidl = true
}
......@@ -1624,6 +1719,7 @@ android_aar_prebuilt("com_android_support_support_vector_drawable_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
create_srcjar = false
}
......@@ -1640,6 +1736,7 @@ android_aar_prebuilt("com_android_support_transition_java") {
":com_android_support_support_annotations_java",
":com_android_support_support_compat_java",
]
skip_jetify = true
deps += [ ":com_android_support_support_fragment_java" ]
}
......@@ -1655,6 +1752,7 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
":com_android_support_collections_java",
":com_android_support_support_annotations_java",
]
skip_jetify = true
ignore_aidl = true
}
......
third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
View file @ ff2bf066
......@@ -254,6 +254,11 @@ class BuildConfigGenerator extends DefaultTask {
sb.append(' strip_drawables = true\n')
}
}
if (dependencyId.startsWith('androidx_') ||
dependencyId.startsWith('com_android_support_') ||
dependencyId.startsWith('android_arch_')) {
sb.append(' skip_jetify = true\n')
}
switch(dependencyId) {
case 'androidx_annotation_annotation':
sb.append(' # https://crbug.com/989505\n')
......
third_party/android_sdk/androidx_browser/BUILD.gn
View file @ ff2bf066
......@@ -5,6 +5,7 @@
import("//build/config/android/rules.gni")
android_library("androidx_browser_java") {
skip_jetify = true
sources = [
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsCallback.java",
......
third_party/android_support_test_runner/BUILD.gn
View file @ ff2bf066
......@@ -5,6 +5,7 @@
import("//build/config/android/rules.gni")
android_java_prebuilt("runner_java") {
skip_jetify = true
testonly = true
jar_path = "lib/runner-release-no-dep.jar"
deps = [
......@@ -16,13 +17,13 @@ android_java_prebuilt("runner_java") {
}
android_java_prebuilt("exposed_instrumentation_api_publish_java") {
skip_jetify = true
jar_path = "lib/exposed-instrumentation-api-publish-no-dep.jar"
}
android_aar_prebuilt("rules_java") {
skip_jetify = true
testonly = true
aar_path = "lib/rules.aar"
deps = [
"//third_party/android_support_test_runner:runner_java",
]
deps = [ "//third_party/android_support_test_runner:runner_java" ]
}
third_party/custom_tabs_client/BUILD.gn
View file @ ff2bf066
......@@ -8,9 +8,7 @@ android_resources("chrome_tabs_client_example_apk_resources") {
resource_dirs = [ "src/Application/src/main/res" ]
android_manifest = "src/Application/src/main/AndroidManifest.xml"
custom_package = "org.chromium.customtabsclient"
deps = [
"//third_party/android_deps:android_support_v7_appcompat_java",
]
deps = [ "//third_party/android_deps:android_support_v7_appcompat_java" ]
}
android_resources("custom_tabs_support_resources") {
......@@ -42,6 +40,7 @@ android_apk("custom_tabs_client_example_apk") {
}
android_library("custom_tabs_client_shared_java") {
skip_jetify = true
sources = [
"src/shared/src/main/java/org/chromium/customtabsclient/shared/CustomTabsHelper.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/KeepAliveService.java",
......@@ -49,13 +48,12 @@ android_library("custom_tabs_client_shared_java") {
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnectionCallback.java",
]
deps = [
":custom_tabs_support_java",
]
deps = [ ":custom_tabs_support_java" ]
chromium_code = false
}
android_library("custom_tabs_support_java") {
skip_jetify = true
sources = [
"src/customtabs/src/android/support/customtabs/CustomTabColorSchemeParams.java",
"src/customtabs/src/android/support/customtabs/CustomTabsCallback.java",
......
third_party/espresso/BUILD.gn
View file @ ff2bf066
......@@ -16,6 +16,7 @@ java_group("espresso_all_java") {
}
android_java_prebuilt("espresso_contrib_java") {
skip_jetify = true
testonly = true
jar_path = "lib/espresso-contrib-release-no-dep.jar"
deps = [
......@@ -29,6 +30,7 @@ android_java_prebuilt("espresso_contrib_java") {
}
android_java_prebuilt("espresso_core_java") {
skip_jetify = true
testonly = true
jar_path = "lib/espresso-core-release-no-dep.jar"
deps = [
......@@ -43,11 +45,13 @@ android_java_prebuilt("espresso_core_java") {
}
android_java_prebuilt("espresso_idling_java") {
skip_jetify = true
testonly = true
jar_path = "lib/espresso-idling-resource-release-no-dep.jar"
}
android_java_prebuilt("espresso_intents_java") {
skip_jetify = true
testonly = true
jar_path = "lib/espresso-intents-release-no-dep.jar"
deps = [
......@@ -62,6 +66,7 @@ android_java_prebuilt("espresso_intents_java") {
android_java_prebuilt("espresso_web_java") {
# Uses org/ccil/cowan/tagsoup/Parser which isn't in third_party.
enable_bytecode_checks = false
skip_jetify = true
testonly = true
jar_path = "lib/espresso-web-release-no-dep.jar"
deps = [
......
third_party/junit/BUILD.gn
View file @ ff2bf066
......@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
android_library("junit") {
chromium_code = false
skip_jetify = true
testonly = true
proguard_configs = [ "//third_party/junit/proguard.flags" ]
deps = [
......
third_party/robolectric/BUILD.gn
View file @ ff2bf066
......@@ -21,36 +21,43 @@ java_group("robolectric_all_java") {
}
java_prebuilt("android-all-4.4_r1-robolectric-r2_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-4.4_r1-robolectric-r2.jar"
}
java_prebuilt("android-all-5.0.2_r3-robolectric-r0_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-5.0.2_r3-robolectric-r0.jar"
}
java_prebuilt("android-all-7.1.0_r7-robolectric-r1_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-7.1.0_r7-robolectric-r1.jar"
}
java_prebuilt("android-all-8.0.0_r4-robolectric-r1_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-8.0.0_r4-robolectric-r1.jar"
}
java_prebuilt("android-all-8.1.0-robolectric-4611349_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-8.1.0-robolectric-4611349.jar"
}
java_prebuilt("android-all-9-robolectric-4913185-2_java") {
skip_jetify = true
testonly = true
jar_path = "lib/android-all-9-robolectric-4913185-2.jar"
}
java_library("robolectric_java") {
skip_jetify = true
testonly = true
# Skip platform checks since we must depend on shadows_core_java here which
......@@ -134,6 +141,7 @@ java_library("robolectric_java") {
}
java_library("robolectric_annotations_java") {
skip_jetify = true
testonly = true
deps = [
":android-all-9-robolectric-4913185-2_java",
......@@ -154,6 +162,7 @@ java_library("robolectric_annotations_java") {
}
java_annotation_processor("robolectric_processor") {
skip_jetify = true
testonly = true
deps = [
":robolectric_annotations_java",
......@@ -219,6 +228,7 @@ group("sdk_list_txt") {
}
java_library("robolectric_resources_java") {
skip_jetify = true
testonly = true
deps = [
":android-all-9-robolectric-4913185-2_java",
......@@ -335,6 +345,7 @@ java_library("robolectric_resources_java") {
}
java_library("robolectric_utils_java") {
skip_jetify = true
testonly = true
deps = [ ":robolectric_annotations_java" ]
sources = [
......@@ -360,6 +371,7 @@ java_library("robolectric_utils_java") {
}
java_library("robolectric_sandbox_java") {
skip_jetify = true
testonly = true
deps = [
":robolectric_annotations_java",
......@@ -415,6 +427,7 @@ java_library("robolectric_sandbox_java") {
java_library("robolectric_junit_java") {
bypass_platform_checks = true
skip_jetify = true
testonly = true
deps = [
":robolectric_annotations_java",
......@@ -427,6 +440,7 @@ java_library("robolectric_junit_java") {
}
java_library("robolectric_shadowapi_java") {
skip_jetify = true
testonly = true
deps = [ "//third_party/jsr-305:jsr_305_javalib" ]
......@@ -447,7 +461,7 @@ java_library("shadows_core_java") {
# Skip platform checks since we must depend on accessibility_test_framework_java
# here which requires_android.
bypass_platform_checks = true
skip_jetify = true
testonly = true
processor_args_javac =
[ "org.robolectric.annotation.processing.shadowPackage=org.robolectric" ]
......@@ -874,7 +888,7 @@ java_library("shadows_multidex_java") {
# Skip platform checks since we must depend on android_support_multidex_java
# here which requires_android.
bypass_platform_checks = true
skip_jetify = true
testonly = true
processor_args_javac = [ "org.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.multidex" ]
provider_configurations = [ "local/shadows/multidex/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider" ]
......@@ -907,6 +921,7 @@ java_library("shadows_play_services_java") {
bypass_platform_checks = true
testonly = true
skip_jetify = true
processor_args_javac = [ "org.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.gms" ]
provider_configurations = [ "local/shadows/playservices/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider" ]
sources = [
......
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