diff options
| author | 2019-11-27 09:20:15 +0000 | |
|---|---|---|
| committer | 2019-11-27 09:20:15 +0000 | |
| commit | a75606be1e01dc05b541c7ebbac554eaa237df98 (patch) | |
| tree | 2573ee607b850abf64c96790156c3aaa0a07f34a /java/app.go | |
| parent | 6aa363b7ae9d65f367faae8f4ed56ea07a005f7b (diff) | |
| parent | c49971469f9a95842b05d2b90da7fb1aab84a8d2 (diff) | |
Merge "Fix incorrect install path for priv-app prebuilt"
Diffstat (limited to 'java/app.go')
| -rwxr-xr-x[-rw-r--r--] | java/app.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go index c63570366..c772e4768 100644..100755 --- a/java/app.go +++ b/java/app.go @@ -974,7 +974,13 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext jnisUncompressed := android.PathForModuleOut(ctx, "jnis-uncompressed", ctx.ModuleName()+".apk") a.uncompressEmbeddedJniLibs(ctx, srcApk, jnisUncompressed.OutputPath) - installDir := android.PathForModuleInstall(ctx, "app", a.BaseModuleName()) + var installDir android.InstallPath + if Bool(a.properties.Privileged) { + installDir = android.PathForModuleInstall(ctx, "priv-app", a.BaseModuleName()) + } else { + installDir = android.PathForModuleInstall(ctx, "app", a.BaseModuleName()) + } + a.dexpreopter.installPath = installDir.Join(ctx, a.BaseModuleName()+".apk") a.dexpreopter.isInstallable = true a.dexpreopter.isPresignedPrebuilt = Bool(a.properties.Presigned) |