Change bool, and string properties to *bool, and *string for java,
python, and genrule.
Test: m -j checkbuild
Bug: b/68853585
Change-Id: Ic9a8083818e920dc399a4b00841e2aa496f70faa
diff --git a/java/app.go b/java/app.go
index c2e9214..05cc975 100644
--- a/java/app.go
+++ b/java/app.go
@@ -32,14 +32,14 @@
type androidAppProperties struct {
// path to a certificate, or the name of a certificate in the default
// certificate directory, or blank to use the default product certificate
- Certificate string
+ Certificate *string
// paths to extra certificates to sign the apk with
Additional_certificates []string
// If set, create package-export.apk, which other packages can
// use to get PRODUCT-agnostic resource data like IDs and type definitions.
- Export_package_resources bool
+ Export_package_resources *bool
// flags passed to aapt when creating the apk
Aaptflags []string
@@ -69,7 +69,7 @@
a.Module.deps(ctx)
if !proptools.Bool(a.properties.No_standard_libs) {
- switch a.deviceProperties.Sdk_version { // TODO: Res_sdk_version?
+ switch String(a.deviceProperties.Sdk_version) { // TODO: Res_sdk_version?
case "current", "system_current", "":
ctx.AddDependency(ctx.Module(), frameworkResTag, "framework-res")
default:
@@ -90,7 +90,7 @@
a.aaptJavaFileList = aaptJavaFileList
// TODO(ccross): export aapt generated java files as a src jar
- if a.appProperties.Export_package_resources {
+ if Bool(a.appProperties.Export_package_resources) {
aaptPackageFlags := append([]string(nil), aaptFlags...)
var hasProduct bool
for _, f := range aaptPackageFlags {
@@ -135,7 +135,7 @@
"--product "+ctx.AConfig().ProductAAPTCharacteristics())
}
- certificate := a.appProperties.Certificate
+ certificate := String(a.appProperties.Certificate)
if certificate == "" {
certificate = ctx.AConfig().DefaultAppCertificate(ctx).String()
} else if dir, _ := filepath.Split(certificate); dir == "" {
@@ -244,7 +244,7 @@
aaptDeps = append(aaptDeps, depFiles...)
})
- sdkVersion := a.deviceProperties.Sdk_version
+ sdkVersion := String(a.deviceProperties.Sdk_version)
if sdkVersion == "" {
sdkVersion = ctx.AConfig().PlatformSdkVersion()
}