Don't generate the blaze generated extension registry for Android tests that define a binary_under_test.

They are filtered out for deployment anyways so it's unnecessary work and it
confuses the one version detector.

RELNOTES: n/a
PiperOrigin-RevId: 184725205

3 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index fca322d84d..fc808ae89a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -226,7 +226,8 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
             ruleContext.getConfiguration().isCodeCoverageEnabled(),
             true /* collectJavaCompilationArgs */,
             true, /* isBinary */
-            excludedRuntimeArtifacts);
+            excludedRuntimeArtifacts,
+            true /* generateExtensionRegistry */);
     ruleContext.assertNoErrors();
 
     Function<Artifact, Artifact> derivedJarFunction =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index ad5def1d46..ab914bcea7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -474,7 +474,8 @@ public class AndroidCommon {
       boolean addCoverageSupport,
       boolean collectJavaCompilationArgs,
       boolean isBinary,
-      NestedSet<Artifact> excludedRuntimeArtifacts)
+      NestedSet<Artifact> excludedRuntimeArtifacts,
+      boolean generateExtensionRegistry)
       throws InterruptedException, RuleErrorException {
 
     classJar = ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_LIBRARY_CLASS_JAR);
@@ -554,7 +555,7 @@ public class AndroidCommon {
         artifactsBuilder,
         collectJavaCompilationArgs,
         filesBuilder,
-        isBinary);
+        generateExtensionRegistry);
     if (ruleContext.hasErrors()) {
       return null;
     }
@@ -605,7 +606,7 @@ public class AndroidCommon {
       JavaCompilationArtifacts.Builder javaArtifactsBuilder,
       boolean collectJavaCompilationArgs,
       NestedSetBuilder<Artifact> filesBuilder,
-      boolean isBinary)
+      boolean generateExtensionRegistry)
       throws InterruptedException {
     JavaTargetAttributes attributes = helper.getAttributes();
     if (ruleContext.hasErrors()) {
@@ -651,7 +652,7 @@ public class AndroidCommon {
         javaArtifactsBuilder,
         nativeHeaderOutput);
 
-    if (isBinary) {
+    if (generateExtensionRegistry) {
       generatedExtensionRegistryProvider =
           javaSemantics.createGeneratedExtensionRegistry(
               ruleContext,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index c65cbdabf4..207cec8dfa 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -173,7 +173,8 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
             false /* addCoverageSupport */,
             true /* collectJavaCompilationArgs */,
             false /* isBinary */,
-            null /* excludedRuntimeArtifacts */);
+            null /* excludedRuntimeArtifacts */,
+            false /* generateExtensionRegistry */);
     if (javaTargetAttributes == null) {
       return null;
     }