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

Commit a3369128 authored by Chris Antol's avatar Chris Antol
Browse files

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

This reverts commit d45836eb.

Reason for revert: Still breaks tests

Bug: 314212435
Change-Id: I35867878c9a8b2aa3d64092a5326c42191569adc
parent d45836eb

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.