Installed APKs should not have prebuilt_ prefix

Bug: 159031374
Test: treehugger & manual
Change-Id: I48f2595781efc1303c777619e082ce7765b73038
This commit is contained in:
Sasha Smundak 2020-06-15 18:25:27 -07:00
parent c9d83d25bb
commit 57f0ee1fa9

View file

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