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

Commit ff5cf349 authored by Ramya Subramanian's avatar Ramya Subramanian Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d10 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365



Change-Id: Iecfcf43f2809a8249c59adeb8092902152f61b51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ea94eb4 29e05d10

java/dex.go

+0 −5
Original line number Diff line number Diff line
@@ -223,11 +223,6 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext, 
	if err != nil {

		ctx.PropertyErrorf("min_sdk_version", "%s", err)

	}

	// V is 35, but we have not bumped the SDK version yet, so check for both.

	if ctx.Config().PlatformSdkVersion().FinalInt() >= 35 ||

		ctx.Config().PlatformSdkCodename() == "VanillaIceCream" {

		flags = append([]string{"-JDcom.android.tools.r8.dexContainerExperiment"}, flags...)

	}



	// If the specified SDK level is 10000, then configure the compiler to use the

	// current platform SDK level and to compile the build as a platform build.