From c49971469f9a95842b05d2b90da7fb1aab84a8d2 Mon Sep 17 00:00:00 2001 From: "Kyeongkab.Nam" Date: Fri, 22 Nov 2019 11:38:16 +0900 Subject: Fix incorrect install path for priv-app prebuilt Dexpreopted files for privleged app prebuilt(android_app_import) are installed wrongly to /system/app. To fix this issue, install path is changed to /system/priv-app in the case that "privileged" flag is true. Bug: 144945646 Test: build and check dexpreopted files of privileged app are installed to /system/priv-app Change-Id: Iec140119f58179a3eb0feeff7af2699fcc855fe7 --- java/app.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 java/app.go (limited to 'java/app.go') diff --git a/java/app.go b/java/app.go old mode 100644 new mode 100755 index c63570366..c772e4768 --- 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) -- cgit v1.2.3-59-g8ed1b