Merge "Enable dex container (DEX v41) for the main branch" into main (a3152468) · Commits · e / os / android_build_soong

android/config.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -2148,6 +2148,10 @@ func (c *config) UseTransitiveJarsInClasspath() bool {
		return c.productVariables.GetBuildFlagBool("RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH")
		}

		func (c *config) UseDexV41() bool {
		return c.productVariables.GetBuildFlagBool("RELEASE_USE_DEX_V41")
		}

		var (
		mainlineApexContributionBuildFlagsToApexNames = map[string]string{
		"RELEASE_APEX_CONTRIBUTIONS_ADBD": "com.android.adbd",

+3 −6

Original line number	Diff line number	Diff line
		@@ -252,16 +252,13 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
		if err != nil {
		ctx.PropertyErrorf("min_sdk_version", "%s", err)
		}
		if !Bool(d.dexProperties.No_dex_container) && effectiveVersion.FinalOrFutureInt() >= 36 {
		if !Bool(d.dexProperties.No_dex_container) && effectiveVersion.FinalOrFutureInt() >= 36 && ctx.Config().UseDexV41() {
		// W is 36, but we have not bumped the SDK version yet, so check for both.
		if ctx.Config().PlatformSdkVersion().FinalInt() >= 36 \|\|
		ctx.Config().PlatformSdkCodename() == "Wear" {
		// TODO(b/329465418): Skip this module since it causes issue with app DRM
		if ctx.ModuleName() != "framework-minus-apex" {
		ctx.Config().PlatformSdkCodename() == "Baklava" {
		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.