Add skip_jetitfy variable to targets.

Bug: 1021634,896775
Change-Id: I10ba6702db5774af270354cb4ee3b94953aa3bdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015734Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#735795}

build/config/android/internal_rules.gni

@@ -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

@@ -4275,6 +4275,7 @@ if (enable_java_templates) {
                                  "deps",
                                  "input_jars_paths",
                                  "proguard_configs",
+                                 "skip_jetify",
                                ])
         if (!defined(deps)) {
           deps = []

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 = [