Add and remove skip_jetify to build.gn targets.

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

build/config/android/rules.gni

@@ -2772,6 +2772,7 @@ if (enable_java_templates) {
                                "native_lib_placeholders",
                                "no_build_hooks",
                                "processor_args_javac",
+                               "skip_jetify",
                                "secondary_abi_loadable_modules",
                                "secondary_native_lib_placeholders",
                                "sources",
@@ -3452,6 +3453,7 @@ if (enable_java_templates) {
                                "secondary_abi_loadable_modules",
                                "secondary_abi_shared_libraries",
                                "secondary_native_lib_placeholders",
+                               "skip_jetify",
                                "shared_libraries",
                                "shared_resources",
                                "shared_resources_whitelist_locales",
@@ -4248,6 +4250,7 @@ if (enable_java_templates) {
       "jar_excluded_patterns",
       "jar_included_patterns",
       "requires_android",
+      "skip_jetify",
       "testonly",
     ]
 
@@ -4279,7 +4282,6 @@ if (enable_java_templates) {
                                  "deps",
                                  "input_jars_paths",
                                  "proguard_configs",
-                                 "skip_jetify",
                                ])
         if (!defined(deps)) {
           deps = []

components/cronet/android/BUILD.gn

@@ -1108,7 +1108,7 @@ if (!is_component_build) {
       "//third_party/netty4:netty_all_java",
     ]
 
-    enable_multidex = false
+    enable_multidex = true
     if (!is_java_debug) {
       proguard_enabled = true
       proguard_configs = [

third_party/android_deps/BUILD.gn

@@ -848,6 +848,7 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
     "//third_party/ow2_asm:asm_java",
     "//third_party/ow2_asm:asm_util_java",
   ]
+  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1769,6 +1770,7 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_core_java") {
     ":org_jetbrains_kotlin_kotlin_stdlib_java",
     "//third_party/gson:gson_java",
   ]
+  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.

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

@@ -256,7 +256,8 @@ class BuildConfigGenerator extends DefaultTask {
         }
         if (dependencyId.startsWith('androidx_') ||
             dependencyId.startsWith('com_android_support_') ||
-            dependencyId.startsWith('android_arch_')) {
+            dependencyId.startsWith('android_arch_') ||
+            dependencyId.startsWith('com_android_tools_build_jetifier')) {
           sb.append('  skip_jetify  = true\n')
         }
         switch(dependencyId) {

third_party/android_sdk/BUILD.gn

@@ -60,10 +60,12 @@ if (enable_java_templates) {
   }
 
   android_library("android_support_chromium_java") {
+    skip_jetify = true
     testonly = true
     sources = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
   }
   android_java_prebuilt("android_gcm_java") {
+    skip_jetify = true
     jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar"
   }
 }

third_party/android_support_test_runner/BUILD.gn

@@ -5,7 +5,6 @@
 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 = [
@@ -22,7 +21,6 @@ android_java_prebuilt("exposed_instrumentation_api_publish_java") {
 }
 
 android_aar_prebuilt("rules_java") {
-  skip_jetify = true
   testonly = true
   aar_path = "lib/rules.aar"
   deps = [ "//third_party/android_support_test_runner:runner_java" ]

third_party/custom_tabs_client/BUILD.gn

@@ -18,6 +18,7 @@ android_resources("custom_tabs_support_resources") {
 }
 
 android_apk("custom_tabs_client_example_apk") {
+  skip_jetify = true
   sources = [
     "src/Application/src/main/java/org/chromium/customtabsclient/BottomBarManager.java",
     "src/Application/src/main/java/org/chromium/customtabsclient/BrowserActionsReceiver.java",

third_party/espresso/BUILD.gn

@@ -16,7 +16,6 @@ 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 = [
@@ -30,7 +29,6 @@ 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 = [
@@ -45,13 +43,11 @@ 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 = [
@@ -66,7 +62,6 @@ 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,7 +6,6 @@ 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 = [