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

Commit 0cc9d267 authored by David Srbecky's avatar David Srbecky Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7f 

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



Change-Id: I9f247846eb500eeee8cadae6e8f6b2cd9dc58aa8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d6d371a 8e1efb7f

java/dex.go

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

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

	}

	if effectiveVersion.FinalOrFutureInt() >= 35 {

		// 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.