Merge "Remove Android compat annotations on jarjar transform." am: aa52a04fdd

Change-Id: I8d356c980b84c5d1ef3dc2132e879c4e21ba1592
2020-04-20 15:27:28 +00:00
parent bd5c3aa81a aa52a04fdd
commit 29a95d1f83
1 changed files with 6 additions and 1 deletions
--- a/java/builder.go
+++ b/java/builder.go
@@ -147,7 +147,12 @@ var (

 	jarjar = pctx.AndroidStaticRule("jarjar",
 		blueprint.RuleParams{
-			Command:     "${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.JarjarCmd} process $rulesFile $in $out",
+			Command: "${config.JavaCmd} ${config.JavaVmFlags}" +
+				// b/146418363 Enable Android specific jarjar transformer to drop compat annotations
+				// for newly repackaged classes. Dropping @UnsupportedAppUsage on repackaged classes
+				// avoids adding new hiddenapis after jarjar'ing.
+				" -DremoveAndroidCompatAnnotations=true" +
+				" -jar ${config.JarjarCmd} process $rulesFile $in $out",
 			CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"},
 		},
 		"rulesFile")