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

Commit acf18d7c authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

uncompressedDex option for android_app_import. 

This also partially consolidates shouldUncompressDex implementations.

Bug: 128610294
Test: TreeHugger
Change-Id: I7cea5a3890ddd473f63c0738a35af067455b5c4d
parent e7d52c77

java/app.go

+18 −12
Original line number Diff line number Diff line
@@ -188,19 +188,12 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { 
		return false

	}



	// Uncompress dex in APKs of privileged apps, and modules used by privileged apps.

	if ctx.Config().UncompressPrivAppDex() &&

		(Bool(a.appProperties.Privileged) ||

			inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules())) {

	// Uncompress dex in APKs of privileged apps

	if ctx.Config().UncompressPrivAppDex() && Bool(a.appProperties.Privileged) {

		return true

	}



	// Uncompress if the dex files is preopted on /system.

	if !a.dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !odexOnSystemOther(ctx, a.dexpreopter.installPath)) {

		return true

	}



	return false

	return shouldUncompressDex(ctx, &a.dexpreopter)

}



func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
@@ -681,6 +674,20 @@ func (a *AndroidAppImport) uncompressEmbeddedJniLibs( 
	rule.Build(pctx, ctx, "uncompress-embedded-jni-libs", "Uncompress embedded JIN libs")

}



// Returns whether this module should have the dex file stored uncompressed in the APK.

func (a *AndroidAppImport) shouldUncompressDex(ctx android.ModuleContext) bool {

	if ctx.Config().UnbundledBuild() {

		return false

	}



	// Uncompress dex in APKs of privileged apps

	if ctx.Config().UncompressPrivAppDex() && Bool(a.properties.Privileged) {

		return true

	}



	return shouldUncompressDex(ctx, &a.dexpreopter)

}



func (a *AndroidAppImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	if String(a.properties.Certificate) == "" && !Bool(a.properties.Presigned) {

		ctx.PropertyErrorf("certificate", "No certificate specified for prebuilt")
@@ -703,12 +710,11 @@ func (a *AndroidAppImport) GenerateAndroidBuildActions(ctx android.ModuleContext 
	jnisUncompressed := android.PathForModuleOut(ctx, "jnis-uncompressed", ctx.ModuleName()+".apk")

	a.uncompressEmbeddedJniLibs(ctx, srcApk, jnisUncompressed.OutputPath)



	// TODO: Uncompress dex if applicable



	installDir := android.PathForModuleInstall(ctx, "app", a.BaseModuleName())

	a.dexpreopter.installPath = installDir.Join(ctx, a.BaseModuleName()+".apk")

	a.dexpreopter.isInstallable = true

	a.dexpreopter.isPresignedPrebuilt = Bool(a.properties.Presigned)

	a.dexpreopter.uncompressedDex = a.shouldUncompressDex(ctx)

	dexOutput := a.dexpreopter.dexpreopt(ctx, jnisUncompressed)



	// Sign or align the package