diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 4 | ||||
| -rw-r--r-- | java/app.go | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 955f22b36..7927acff7 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -317,7 +317,7 @@ func (app *AndroidApp) AndroidMkEntries() android.AndroidMkEntries { entries.SetPath("LOCAL_FULL_MANIFEST_FILE", app.manifestPath) - entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", Bool(app.appProperties.Privileged)) + entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", app.Privileged()) entries.SetPath("LOCAL_CERTIFICATE", app.certificate.Pem) entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", app.getOverriddenPackages()...) @@ -630,7 +630,7 @@ func (a *AndroidAppImport) AndroidMkEntries() android.AndroidMkEntries { Include: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(entries *android.AndroidMkEntries) { - entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", Bool(a.properties.Privileged)) + entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", a.Privileged()) if a.certificate != nil { entries.SetPath("LOCAL_CERTIFICATE", a.certificate.Pem) } else { diff --git a/java/app.go b/java/app.go index 6b640f1cf..3dbcbf468 100644 --- a/java/app.go +++ b/java/app.go @@ -228,7 +228,7 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { // Uncompress dex in APKs of privileged apps (even for unbundled builds, they may // be preinstalled as prebuilts). - if ctx.Config().UncompressPrivAppDex() && Bool(a.appProperties.Privileged) { + if ctx.Config().UncompressPrivAppDex() && a.Privileged() { return true } @@ -316,7 +316,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) android.Path { if ctx.ModuleName() == "framework-res" { // framework-res.apk is installed as system/framework/framework-res.apk installDir = "framework" - } else if Bool(a.appProperties.Privileged) { + } else if a.Privileged() { installDir = filepath.Join("priv-app", a.installApkName) } else { installDir = filepath.Join("app", a.installApkName) @@ -442,7 +442,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { if ctx.ModuleName() == "framework-res" { // framework-res.apk is installed as system/framework/framework-res.apk a.installDir = android.PathForModuleInstall(ctx, "framework") - } else if Bool(a.appProperties.Privileged) { + } else if a.Privileged() { a.installDir = android.PathForModuleInstall(ctx, "priv-app", a.installApkName) } else if ctx.InstallInTestcases() { a.installDir = android.PathForModuleInstall(ctx, a.installApkName) @@ -555,6 +555,10 @@ func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) { return a.Library.OutputFiles(tag) } +func (a *AndroidApp) Privileged() bool { + return Bool(a.appProperties.Privileged) +} + // android_app compiles sources and Android resources into an Android application package `.apk` file. func AndroidAppFactory() android.Module { module := &AndroidApp{} @@ -872,7 +876,7 @@ func (a *AndroidAppImport) shouldUncompressDex(ctx android.ModuleContext) bool { } // Uncompress dex in APKs of privileged apps - if ctx.Config().UncompressPrivAppDex() && Bool(a.properties.Privileged) { + if ctx.Config().UncompressPrivAppDex() && a.Privileged() { return true } @@ -1003,6 +1007,10 @@ func (a *AndroidAppImport) populateAllVariantStructs() { a.AddProperties(a.archVariants) } +func (a *AndroidAppImport) Privileged() bool { + return Bool(a.properties.Privileged) +} + func createVariantGroupType(variants []string, variantGroupName string) reflect.Type { props := reflect.TypeOf((*AndroidAppImportProperties)(nil)) |