Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762d9f38 authored by Artur Satayev's avatar Artur Satayev Committed by satayev
Browse files

Remove Android compat annotations on jarjar transform. 

Set a system property to enable Android specific transformer that drops
UnsupportedAppUsage annotation for repackaged classes to avoid adding
unneeded hidden api symbols on jarjar.

Bug: 146418363
Test: m, manual diff hiddenapi-flags.csv
Exempt-From-Owner-Approval: patch approved by owner
Change-Id: I10b49feb15257301574162b5d389cbc30277f672
parent acc5448f

java/builder.go

+6 −1
Original line number Diff line number Diff line
@@ -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")