aboutsummaryrefslogtreecommitdiffstats
path: root/java/app.go
diff options
context:
space:
mode:
Diffstat (limited to 'java/app.go')
-rw-r--r--java/app.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go
index 4b0eec13..bcbf6f31 100644
--- a/java/app.go
+++ b/java/app.go
@@ -692,6 +692,8 @@ type AndroidAppImport struct {
certificate *Certificate
dexpreopter
+
+ installPath android.OutputPath
}
type AndroidAppImportProperties struct {
@@ -717,6 +719,9 @@ type AndroidAppImportProperties struct {
// binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will be removed
// from PRODUCT_PACKAGES.
Overrides []string
+
+ // Optional name for the installed app. If unspecified, it is derived from the module name.
+ Filename *string
}
// Chooses a source APK path to use based on the module and product specs.
@@ -857,7 +862,8 @@ func (a *AndroidAppImport) GenerateAndroidBuildActions(ctx android.ModuleContext
// TODO: Optionally compress the output apk.
- ctx.InstallFile(installDir, a.BaseModuleName()+".apk", a.outputFile)
+ a.installPath = ctx.InstallFile(installDir,
+ proptools.StringDefault(a.properties.Filename, a.BaseModuleName()+".apk"), a.outputFile)
// TODO: androidmk converter jni libs
}