diff options
| author | 2022-09-22 10:41:42 +0200 | |
|---|---|---|
| committer | 2022-09-23 19:11:11 +0200 | |
| commit | 351bac996cb6e329f935aa70e59fa9f4aa58d65d (patch) | |
| tree | 0fa1b238261062c52b576012f4042bff0a997c02 /java/app_builder.go | |
| parent | eb30142616c1c79e8b84970fb044a9589baa7dfc (diff) | |
Add soong support for resource shrinking
This adds a new flag to the optimize section to allow invoking the resource shrinker
Bug: 246217952
Test: m
Change-Id: I2e7851af1189db2a6adf6f9f9f444a1d7f3a8d60
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 18a975181..d20a6bfe4 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) @@ -65,7 +65,6 @@ func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.Writa if jniJarFile != nil { inputs = append(inputs, jniJarFile) } - ctx.Build(pctx, android.BuildParams{ Rule: combineApk, Inputs: inputs, @@ -73,6 +72,11 @@ func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.Writa 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) } @@ -84,7 +88,6 @@ func SignAppPackage(ctx android.ModuleContext, signedApk android.WritablePath, u certificateArgs = append(certificateArgs, c.Pem.String(), c.Key.String()) deps = append(deps, c.Pem, c.Key) } - outputFiles := android.WritablePaths{signedApk} var flags []string if v4SignatureFile != nil { @@ -182,7 +185,7 @@ func BuildBundleModule(ctx android.ModuleContext, outputFile android.WritablePat packageFile, jniJarFile, dexJarFile android.Path) { protoResJarFile := android.PathForModuleOut(ctx, "package-res.pb.apk") - aapt2Convert(ctx, protoResJarFile, packageFile) + aapt2Convert(ctx, protoResJarFile, packageFile, "proto") var zips android.Paths |