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

Commit 43668c6f authored by Yanning Jia's avatar Yanning Jia Committed by David Srbecky
Browse files

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

This reverts commit 7022550d.

Reason for revert: Breaks app's DRM

Bug: 317744117
Change-Id: I539e6ec037db1c297fe7cf85d294bebe963ab214
parent 7022550d

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.