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

Commit e4d0e949 authored by David Srbecky's avatar David Srbecky
Browse files

Revert^2 "Enable dex container (DEX v41) for the whole system" 

This reverts commit 432fbfa8.

Reason for revert: Reland

Test: device boots
Change-Id: I95e2ae124c6d4a74ca5303f898583de992b15cbd
parent 37665538

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.