openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Installed APKs should not have `prebuilt_` prefix" am: 001ad5a6fc am: 05cd5562f2 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339635

Change-Id: Ia2a3197e0b509387ff782bf7e295bff7e8b56471
This commit is contained in:
Treehugger Robot 2020-06-16 23:01:29 +00:00 committed by Automerger Merge Worker
parent f1429cab7d 05cd5562f2
commit 6e28ab8c7a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@ -133,7 +133,7 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext)
// We are assuming here that the master file in the APK
// set has `.apk` suffix. If it doesn't the build will fail.
// APK sets containing APEX files are handled elsewhere.
as.masterFile = ctx.ModuleName() + ".apk"
as.masterFile = as.BaseModuleName() + ".apk"
screenDensities := "all"
if dpis := ctx.Config().ProductAAPTPrebuiltDPI(); len(dpis) > 0 {
screenDensities = strings.ToUpper(strings.Join(dpis, ","))