diff options
| author | 2023-11-03 12:12:40 +0000 | |
|---|---|---|
| committer | 2023-11-03 12:12:40 +0000 | |
| commit | 2e09e68e56707bf79d70d40add14cff3b5b599d0 (patch) | |
| tree | 6fc1679f9c03f5164ececfc0c17cd909a176d75e /java/app_builder.go | |
| parent | 0978d6a4b12473d99cc953511b59b6c0df909102 (diff) | |
| parent | a9fd59a7f28df05f9d75bda7d661241e4d1a3f6a (diff) | |
Merge "Revert "Use R8 for resource shrinking"" into main
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 943ce317b..d397ff7f5 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -52,7 +52,7 @@ var combineApk = pctx.AndroidStaticRule("combineApk", }) func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, - packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate, deps android.Paths, v4SignatureFile android.WritablePath, lineageFile android.Path, rotationMinSdkVersion string) { + packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate, deps android.Paths, v4SignatureFile android.WritablePath, lineageFile android.Path, rotationMinSdkVersion string, shrinkResources bool) { unsignedApkName := strings.TrimSuffix(outputFile.Base(), ".apk") + "-unsigned.apk" unsignedApk := android.PathForModuleOut(ctx, unsignedApkName) @@ -71,6 +71,12 @@ func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.Writa Output: unsignedApk, Implicits: deps, }) + + if shrinkResources { + shrunkenApk := android.PathForModuleOut(ctx, "resource-shrunken", unsignedApk.Base()) + ShrinkResources(ctx, unsignedApk, shrunkenApk) + unsignedApk = shrunkenApk + } SignAppPackage(ctx, outputFile, unsignedApk, certificates, v4SignatureFile, lineageFile, rotationMinSdkVersion) } |