Merge "Add Skia deps to the list of available Windows libraries"
diff --git a/android/config.go b/android/config.go
index cf4d6e55..393382b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -983,8 +983,8 @@
return c.productVariables.EnforceSystemCertificateWhitelist
}
-func (c *config) HiddenAPIPublicList() string {
- return String(c.productVariables.HiddenAPIPublicList)
+func (c *config) HiddenAPIStubFlags() string {
+ return String(c.productVariables.HiddenAPIStubFlags)
}
func (c *config) HiddenAPIFlags() string {
diff --git a/android/variable.go b/android/variable.go
index 46b1155..8333635 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -273,7 +273,7 @@
EnforceSystemCertificateWhitelist []string `json:",omitempty"`
// TODO(ccross): move these to a Singleton in Soong
- HiddenAPIPublicList *string `json:",omitempty"`
+ HiddenAPIStubFlags *string `json:",omitempty"`
HiddenAPIFlags *string `json:",omitempty"`
HiddenAPIExtraAppUsageJars []string `json:",omitempty"`
}
diff --git a/java/hiddenapi.go b/java/hiddenapi.go
index 29f23b1..6a603cf 100644
--- a/java/hiddenapi.go
+++ b/java/hiddenapi.go
@@ -25,24 +25,24 @@
)
var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{
- Command: "${config.Class2Greylist} --public-api-list ${publicAPIList} $in $outFlag $out",
+ Command: "${config.Class2Greylist} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
CommandDeps: []string{"${config.Class2Greylist}"},
-}, "outFlag", "publicAPIList")
+}, "outFlag", "stubAPIFlags")
func hiddenAPIGenerateCSV(ctx android.ModuleContext, classesJar android.Path) {
flagsCSV := android.PathForModuleOut(ctx, "hiddenapi", "flags.csv")
metadataCSV := android.PathForModuleOut(ctx, "hiddenapi", "metadata.csv")
- publicList := &bootImagePath{ctx.Config().HiddenAPIPublicList()}
+ stubFlagsCSV := &bootImagePath{ctx.Config().HiddenAPIStubFlags()}
ctx.Build(pctx, android.BuildParams{
Rule: hiddenAPIGenerateCSVRule,
Description: "hiddenapi flags",
Input: classesJar,
Output: flagsCSV,
- Implicit: publicList,
+ Implicit: stubFlagsCSV,
Args: map[string]string{
- "outFlag": "--write-flags-csv",
- "publicAPIList": publicList.String(),
+ "outFlag": "--write-flags-csv",
+ "stubAPIFlags": stubFlagsCSV.String(),
},
})
@@ -51,10 +51,10 @@
Description: "hiddenapi metadata",
Input: classesJar,
Output: metadataCSV,
- Implicit: publicList,
+ Implicit: stubFlagsCSV,
Args: map[string]string{
- "outFlag": "--write-metadata-csv",
- "publicAPIList": publicList.String(),
+ "outFlag": "--write-metadata-csv",
+ "stubAPIFlags": stubFlagsCSV.String(),
},
})
