From 5a1af88dd5a69154468832dd2af5812bd904edc0 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 17 Jan 2019 14:31:52 -0800
Subject: [PATCH] Use module name as intermediates name for android_app modules

Use foo.apk instead of package.apk for the intermediate package for
a module named foo.

Fixes: 122996822
Test: m checkbuild
Change-Id: I38058a54038e1c2eeaefc0f0e7f450a74a3e96a7
---
 java/app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/app.go b/java/app.go
index 4bae78aca..e44737e8b 100644
--- a/java/app.go
+++ b/java/app.go
@@ -261,7 +261,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
 
 	certificates = append([]Certificate{a.certificate}, certificateDeps...)
 
-	packageFile := android.PathForModuleOut(ctx, "package.apk")
+	packageFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".apk")
 	CreateAppPackage(ctx, packageFile, a.exportPackage, jniJarFile, dexJarFile, certificates)
 
 	if !a.Module.Platform() {