android_deps: Disable bytecode rewriting for buildCompile targets

And fix a bug that we revealed when trying to add some new libs, where
deps of both buildCompile and compile were being marked as !isShipped.

Bug: 693079
Change-Id: I8ee83a5529a48aeb117efca8cf36f968c695f10c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893143Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711405}

third_party/android_deps/BUILD.gn

@@ -1050,6 +1050,7 @@ java_prebuilt("com_google_dagger_dagger_java") {
 java_prebuilt("com_google_dagger_dagger_compiler_java") {
   jar_path = "libs/com_google_dagger_dagger_compiler/dagger-compiler-2.17.jar"
   output_name = "com_google_dagger_dagger_compiler"
+  enable_bytecode_rewriter = false
   deps = [
     ":com_google_dagger_dagger_java",
     ":com_google_dagger_dagger_producers_java",
@@ -1073,6 +1074,7 @@ java_prebuilt("com_google_protobuf_protobuf_lite_java") {
 java_prebuilt("com_squareup_javapoet_java") {
   jar_path = "libs/com_squareup_javapoet/javapoet-1.11.0.jar"
   output_name = "com_squareup_javapoet"
+  enable_bytecode_rewriter = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1697,6 +1699,7 @@ android_aar_prebuilt("google_play_services_stats_java") {
 java_prebuilt("com_google_code_findbugs_jsr305_java") {
   jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-1.3.9.jar"
   output_name = "com_google_code_findbugs_jsr305"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1707,6 +1710,7 @@ java_prebuilt("com_google_code_findbugs_jsr305_java") {
 java_prebuilt("com_google_dagger_dagger_producers_java") {
   jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.17.jar"
   output_name = "com_google_dagger_dagger_producers"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1723,6 +1727,7 @@ java_prebuilt("com_google_dagger_dagger_producers_java") {
 java_prebuilt("com_google_dagger_dagger_spi_java") {
   jar_path = "libs/com_google_dagger_dagger_spi/dagger-spi-2.17.jar"
   output_name = "com_google_dagger_dagger_spi"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1739,6 +1744,7 @@ java_prebuilt("com_google_dagger_dagger_spi_java") {
 java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
   jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.1.3.jar"
   output_name = "com_google_errorprone_error_prone_annotations"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1750,6 +1756,7 @@ java_prebuilt("com_google_errorprone_javac_shaded_java") {
   jar_path =
       "libs/com_google_errorprone_javac_shaded/javac-shaded-9-dev-r4023-3.jar"
   output_name = "com_google_errorprone_javac_shaded"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1760,6 +1767,7 @@ java_prebuilt("com_google_errorprone_javac_shaded_java") {
 java_prebuilt("com_google_googlejavaformat_google_java_format_java") {
   jar_path = "libs/com_google_googlejavaformat_google_java_format/google-java-format-1.5.jar"
   output_name = "com_google_googlejavaformat_google_java_format"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1774,6 +1782,7 @@ java_prebuilt("com_google_googlejavaformat_google_java_format_java") {
 java_prebuilt("com_google_guava_guava_java") {
   jar_path = "libs/com_google_guava_guava/guava-25.0-jre.jar"
   output_name = "com_google_guava_guava"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1792,6 +1801,7 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
   jar_path =
       "libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.1.jar"
   output_name = "com_google_j2objc_j2objc_annotations"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1817,6 +1827,7 @@ java_prebuilt("net_sf_kxml_kxml2_java") {
 java_prebuilt("org_checkerframework_checker_compat_qual_java") {
   jar_path = "libs/org_checkerframework_checker_compat_qual/checker-compat-qual-2.3.0.jar"
   output_name = "org_checkerframework_checker_compat_qual"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.
@@ -1827,6 +1838,7 @@ java_prebuilt("org_checkerframework_checker_compat_qual_java") {
 java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
   jar_path = "libs/org_codehaus_mojo_animal_sniffer_annotations/animal-sniffer-annotations-1.14.jar"
   output_name = "org_codehaus_mojo_animal_sniffer_annotations"
+  enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //tools/android/roll/android_deps/build.gradle.

tools/android/roll/android_deps/build.gradle

@@ -114,22 +114,19 @@ dependencies {
 
     compile "com.android.support:multidex:1.0.0"
 
-    buildCompile "javax.annotation:jsr250-api:1.0"
-    buildCompile "javax.inject:javax.inject:1"
+    compile "com.google.protobuf:protobuf-lite:3.0.1"
+    compile "javax.annotation:jsr250-api:1.0"
+    compile "javax.inject:javax.inject:1"
 
-    // Dagger
+    // buildCompile targets have supports_android = false.
     def daggerVersion = '2.17'
-    buildCompile "com.google.dagger:dagger:${daggerVersion}"
-    annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
-
-    // JavaPoet
-    // Matches version depended on by Dagger. Uses annotationProcessor so that
-    // it doesn't get supports_android, which is given by compile.
-    annotationProcessor "com.squareup:javapoet:1.11.0"
+    compile "com.google.dagger:dagger:${daggerVersion}"
+    buildCompile "com.google.dagger:dagger-compiler:${daggerVersion}"
 
-    compile "com.google.protobuf:protobuf-lite:3.0.1"
+    // Matches version depended on by Dagger.
+    buildCompile "com.squareup:javapoet:1.11.0"
 
-    // Androidx test libraries
+    // testCompile targets have test_only = true.
     testCompile "androidx.test:core:1.0.0"
     testCompile "androidx.test:monitor:1.1.0"
     testCompile "androidx.test:rules:1.1.0"

tools/android/roll/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -183,7 +183,13 @@ class BuildConfigGenerator extends DefaultTask {
                   jar_path = "${libPath}/${dependency.fileName}"
                   output_name = "${dependency.id}"
                 """.stripIndent())
-                if (dependency.supportsAndroid) sb.append("  supports_android = true\n")
+                if (dependency.supportsAndroid) {
+                  sb.append("  supports_android = true\n")
+                } else {
+                  // No point in enabling asserts third-party prebuilts.
+                  // Also required to break a dependency cycle for errorprone.
+                  sb.append("  enable_bytecode_rewriter = false\n")
+                }
             } else if (dependency.extension == 'aar') {
                 sb.append("""\
                 android_aar_prebuilt("${targetName}") {

tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy

@@ -87,16 +87,13 @@ class ChromiumDepGraph {
             assert dep != null : "No dependency collected for artifact ${artifact.name}"
             dep.supportsAndroid = true
             dep.testOnly = true
-            dep.isShipped = false
         }
 
         buildCompileConfig.resolvedArtifacts.each { artifact ->
             def id = makeModuleId(artifact)
             def dep = dependencies.get(id)
             assert dep != null : "No dependency collected for artifact ${artifact.name}"
-            dep.supportsAndroid = true
             dep.testOnly = false
-            dep.isShipped = false
         }
 
         compileConfig.resolvedArtifacts.each { artifact ->