Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351bac99 authored by Rico Wind's avatar Rico Wind
Browse files

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
parent eb301426

java/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ bootstrap_go_package { 
        "plugin.go",

        "prebuilt_apis.go",

        "proto.go",

        "resourceshrinker.go",

        "robolectric.go",

        "rro.go",

        "sdk.go",

java/aapt2.go

+8 −4
Original line number Diff line number Diff line
@@ -256,17 +256,21 @@ func aapt2Link(ctx android.ModuleContext, 


var aapt2ConvertRule = pctx.AndroidStaticRule("aapt2Convert",

	blueprint.RuleParams{

		Command:     `${config.Aapt2Cmd} convert --output-format proto $in -o $out`,

		Command:     `${config.Aapt2Cmd} convert --output-format $format $in -o $out`,

		CommandDeps: []string{"${config.Aapt2Cmd}"},

	})

	}, "format",

)



// Converts xml files and resource tables (resources.arsc) in the given jar/apk file to a proto

// format. The proto definition is available at frameworks/base/tools/aapt2/Resources.proto.

func aapt2Convert(ctx android.ModuleContext, out android.WritablePath, in android.Path) {

func aapt2Convert(ctx android.ModuleContext, out android.WritablePath, in android.Path, format string) {

	ctx.Build(pctx, android.BuildParams{

		Rule:        aapt2ConvertRule,

		Input:       in,

		Output:      out,

		Description: "convert to proto",

		Description: "convert to " + format,

		Args: map[string]string{

			"format": format,

		},

	})

}

java/app.go

+2 −3
Original line number Diff line number Diff line
@@ -667,10 +667,9 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
	if lineage := String(a.overridableAppProperties.Lineage); lineage != "" {

		lineageFile = android.PathForModuleSrc(ctx, lineage)

	}



	rotationMinSdkVersion := String(a.overridableAppProperties.RotationMinSdkVersion)



	CreateAndSignAppPackage(ctx, packageFile, a.exportPackage, jniJarFile, dexJarFile, certificates, apkDeps, v4SignatureFile, lineageFile, rotationMinSdkVersion)

	CreateAndSignAppPackage(ctx, packageFile, a.exportPackage, jniJarFile, dexJarFile, certificates, apkDeps, v4SignatureFile, lineageFile, rotationMinSdkVersion, Bool(a.dexProperties.Optimize.Shrink_resources))

	a.outputFile = packageFile

	if v4SigningRequested {

		a.extraOutputFiles = append(a.extraOutputFiles, v4SignatureFile)
@@ -699,7 +698,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
		if v4SigningRequested {

			v4SignatureFile = android.PathForModuleOut(ctx, a.installApkName+"_"+split.suffix+".apk.idsig")

		}

		CreateAndSignAppPackage(ctx, packageFile, split.path, nil, nil, certificates, apkDeps, v4SignatureFile, lineageFile, rotationMinSdkVersion)

		CreateAndSignAppPackage(ctx, packageFile, split.path, nil, nil, certificates, apkDeps, v4SignatureFile, lineageFile, rotationMinSdkVersion, false)

		a.extraOutputFiles = append(a.extraOutputFiles, packageFile)

		if v4SigningRequested {

			a.extraOutputFiles = append(a.extraOutputFiles, v4SignatureFile)

java/app_builder.go

+7 −4
Original line number Diff line number Diff line
@@ -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

java/config/config.go

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ func init() { 
	pctx.HostBinToolVariable("ApiCheckCmd", "apicheck")

	pctx.HostBinToolVariable("D8Cmd", "d8")

	pctx.HostBinToolVariable("R8Cmd", "r8")

	pctx.HostBinToolVariable("ResourceShrinkerCmd", "resourceshrinker")

	pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")

	pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")

	pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {