From b82a2a278badc282d43280ba13f544ddecc2d631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Mon, 3 Oct 2022 14:15:52 +0200
Subject: [PATCH] Enable dex container (DEX v41) for the whole system

Bug: b/249922554
Test: device boots
Change-Id: Idc63034cc7d5f4bc4533d1f580eeffe1494b56a6
---
 java/dex.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/dex.go b/java/dex.go
index dab0836ff..8af06d530 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -221,6 +221,11 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
 	if err != nil {
 		ctx.PropertyErrorf("min_sdk_version", "%s", err)
 	}
+	// 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.