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

Commit c6176eb9 authored by Serdar Kocdemir's avatar Serdar Kocdemir Committed by Automerger Merge Worker
Browse files

Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into... 

Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d517 am: 96e84f84

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



Change-Id: Ic4f33ebd8a4bbc688e3e5c4360fd2f9bfe27bc3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b944556c 96e84f84

java/dex.go

+0 −7
Original line number Diff line number Diff line
@@ -223,13 +223,6 @@ 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.