Move hiddenapi to Soong
Perform hiddenapi CSV generation and dex encoding for Soong modules
in Soong. This fixes an issue where dexpreopting was happening on
a different jar than was being installed.
Bug: 122856783
Test: m checkbuild
Test: no change out/target/common/obj/PACKAGING/hiddenapi-flags.csv
Test: only ordering change to out/target/common/obj/PACKAGING/hiddenapi-greylist.csv
Test: cts/tests/signature/runSignatureTests.sh
Change-Id: I4fc481efc29e73cb2bdaacf672e86d5f6f0075ae
diff --git a/android/config.go b/android/config.go
index 09d9cbc..cf4d6e5 100644
--- a/android/config.go
+++ b/android/config.go
@@ -983,6 +983,18 @@
return c.productVariables.EnforceSystemCertificateWhitelist
}
+func (c *config) HiddenAPIPublicList() string {
+ return String(c.productVariables.HiddenAPIPublicList)
+}
+
+func (c *config) HiddenAPIFlags() string {
+ return String(c.productVariables.HiddenAPIFlags)
+}
+
+func (c *config) HiddenAPIExtraAppUsageJars() []string {
+ return c.productVariables.HiddenAPIExtraAppUsageJars
+}
+
func stringSlice(s *[]string) []string {
if s != nil {
return *s
diff --git a/android/variable.go b/android/variable.go
index e19d858..46b1155 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -271,6 +271,11 @@
EnforceSystemCertificate *bool `json:",omitempty"`
EnforceSystemCertificateWhitelist []string `json:",omitempty"`
+
+ // TODO(ccross): move these to a Singleton in Soong
+ HiddenAPIPublicList *string `json:",omitempty"`
+ HiddenAPIFlags *string `json:",omitempty"`
+ HiddenAPIExtraAppUsageJars []string `json:",omitempty"`
}
func boolPtr(v bool) *bool {