From e560c4aabc9ef65ad10f6d795f56f2a1fbd8b3db Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 19 Mar 2019 16:03:11 -0700 Subject: 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 --- java/app_builder.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'java/app_builder.go') 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 { -- cgit v1.2.3-59-g8ed1b