StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support privleged app in APEX"

Browse Source
This commit is contained in:
Treehugger Robot
2019-10-18 01:30:39 +00:00
committed by Gerrit Code Review
parent c5bba642f1 f7487318ac
commit d091c6a67a
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/app.go
View File

@@ -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))