From 57f0ee1fa9bb32bcb8a6cb9ac4463a7d1c5c8283 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 15 Jun 2020 18:25:27 -0700 Subject: [PATCH] Installed APKs should not have `prebuilt_` prefix Bug: 159031374 Test: treehugger & manual Change-Id: I48f2595781efc1303c777619e082ce7765b73038 --- java/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app.go b/java/app.go index 0fdede13a..74c92a6b5 100755 --- a/java/app.go +++ b/java/app.go @@ -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, ","))