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

Commit 28e36b14 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Store uncompressed and aligned DEX files for java libs in APEXes."

parents 70b01624 f491dde8

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -3014,7 +3014,7 @@ func TestApexWithApps(t *testing.T) { 
	ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPriv/AppFooPriv.apk")



	// JNI libraries are embedded inside APK

	appZipRule := ctx.ModuleForTests("AppFoo", "android_common_myapex").Rule("zip")

	appZipRule := ctx.ModuleForTests("AppFoo", "android_common_myapex").Description("zip jni lib")

	libjniOutput := ctx.ModuleForTests("libjni", "android_arm64_armv8-a_shared_myapex").Module().(*cc.Module).OutputFile()

	ensureListContains(t, appZipRule.Implicits.Strings(), libjniOutput.String())

	// ... uncompressed

java/java.go

+5 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,11 @@ type Library struct { 
}



func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {

	// Store uncompressed (and aligned) any dex files from jars in APEXes.

	if am, ok := ctx.Module().(android.ApexModule); ok && !am.IsForPlatform() {

		return true

	}



	// Store uncompressed (and do not strip) dex files from boot class path jars.

	if inList(ctx.ModuleName(), ctx.Config().BootJars()) {

		return true