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

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

Change-Id: I2149948b115e232d4e31e0b3bff60a4d39fa16b0
This commit is contained in:
Treehugger Robot 2020-06-16 22:47:47 +00:00 committed by Automerger Merge Worker
commit 05cd5562f2

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, ","))