summaryrefslogtreecommitdiff
path: root/java/app_builder.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-03-19 16:03:11 -0700
committer Colin Cross <ccross@android.com> 2019-03-19 23:33:47 +0000
commite560c4aabc9ef65ad10f6d795f56f2a1fbd8b3db (patch)
tree495f88e3db5e8aa9511a451a11bc2ec6f6c83353 /java/app_builder.go
parent1b7a4b00742fe7bcd22ae04e1b9eae2c01b3677c (diff)
Support package_splits
Pass the package_splits list from the property to aapt2 as --split arguments, sign the extra outputs, install them, and add them as extra output files for SourceFileProducer. Bug: 127921149 Test: TestAppSplits Change-Id: Id94a53ae6a8a68ec81e98abba2fefc9c23feaa7a
Diffstat (limited to 'java/app_builder.go')
-rw-r--r--java/app_builder.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/app_builder.go b/java/app_builder.go
index bc91d55e4..e5ccbbcd5 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -65,7 +65,8 @@ var combineApk = pctx.AndroidStaticRule("combineApk",
func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath,
packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate) {
- unsignedApk := android.PathForModuleOut(ctx, "unsigned.apk")
+ unsignedApkName := strings.TrimSuffix(outputFile.Base(), ".apk") + "-unsigned.apk"
+ unsignedApk := android.PathForModuleOut(ctx, unsignedApkName)
var inputs android.Paths
if dexJarFile != nil {