Fix a bug in ART profile generation that proguardOutputMap might be null and breaks the build. Also add an unit test for this.

zhaoqxu · copybara-github · commit e05060d97c02 · 2022-10-12T15:52:49.000-07:00
BEGIN_PUBLIC
Internal Change
END_PUBLIC

PiperOrigin-RevId: 480737920
Change-Id: I9d57d175b13a28b24ae6de0e0cebcd826c7cf431
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
@@ -121,10 +121,7 @@ public void registerMigrationRuleError(RuleContext ruleContext) throws RuleError
   /* Bazel does not currently support baseline profiles in the final apk.  */
   @Override
   public Artifact getArtProfileForApk(
-      RuleContext ruleContext,
-      Artifact finalClassesDex,
-      Artifact proguardOutputMap,
-      boolean hasProguardSpecs) {
+      RuleContext ruleContext, Artifact finalClassesDex, Artifact proguardOutputMap) {
     return null;
   }
 }
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
@@ -673,8 +673,7 @@ public static RuleConfiguredTargetBuilder createAndroidBinary(
     }
 
     Artifact artProfileZip =
-        androidSemantics.getArtProfileForApk(
-            ruleContext, finalClassesDex, proguardOutputMap, hasProguardSpecs);
+        androidSemantics.getArtProfileForApk(ruleContext, finalClassesDex, finalProguardOutputMap);
     Artifact unsignedApk =
         ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_BINARY_UNSIGNED_APK);
     Artifact zipAlignedApk =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
@@ -111,10 +111,7 @@ default void validateAndroidLibraryRuleContext(RuleContext ruleContext)
 
   /** The artifact for ART profile information. */
   Artifact getArtProfileForApk(
-      RuleContext ruleContext,
-      Artifact finalClassesDex,
-      Artifact proguardOutputMap,
-      boolean hasProguardSpecs);
+      RuleContext ruleContext, Artifact finalClassesDex, Artifact proguardOutputMap);
 
   boolean postprocessClassesRewritesMap(RuleContext ruleContext);
 

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,7 @@ public void registerMigrationRuleError(RuleContext ruleContext) throws RuleError`
`121`	`121`	`/* Bazel does not currently support baseline profiles in the final apk. */`
`122`	`122`	`@Override`
`123`	`123`	`public Artifact getArtProfileForApk(`
`124`		`- RuleContext ruleContext,`
`125`		`- Artifact finalClassesDex,`
`126`		`- Artifact proguardOutputMap,`
`127`		`- boolean hasProguardSpecs) {`
	`124`	`+ RuleContext ruleContext, Artifact finalClassesDex, Artifact proguardOutputMap) {`
`128`	`125`	`return null;`
`129`	`126`	`}`
`130`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -673,8 +673,7 @@ public static RuleConfiguredTargetBuilder createAndroidBinary(`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`Artifact artProfileZip =`
`676`		`- androidSemantics.getArtProfileForApk(`
`677`		`- ruleContext, finalClassesDex, proguardOutputMap, hasProguardSpecs);`
	`676`	`+ androidSemantics.getArtProfileForApk(ruleContext, finalClassesDex, finalProguardOutputMap);`
`678`	`677`	`Artifact unsignedApk =`
`679`	`678`	`ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_BINARY_UNSIGNED_APK);`
`680`	`679`	`Artifact zipAlignedApk =`