From c8160584f398bfd805d05a9d3dac2a3bc986b2db Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 10 Jul 2024 08:32:45 +0100 Subject: [PATCH] Add property `No_dex_container` to `dexProperies`. This is needed to allow individual apps disable dex container (also known as "multi-dex") once it has been enabled globally. This property does not translate to D8 options, it is used only in the build system. Bug: 341652226 Bug: 329907267 Test: atest CarLauncherTests -- --abi x86_64 Change-Id: I3afda554af93dbb35bb2f4a8032ac0f5ed1df40d --- java/dex.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/dex.go b/java/dex.go index c75e7749b..7bb69257c 100644 --- a/java/dex.go +++ b/java/dex.go @@ -91,6 +91,10 @@ type DexProperties struct { // Exclude kotlinc generate files: *.kotlin_module, *.kotlin_builtins. Defaults to false. Exclude_kotlinc_generated_files *bool + + // Disable dex container (also known as "multi-dex"). + // This may be necessary as a temporary workaround to mask toolchain bugs (see b/341652226). + No_dex_container *bool } type dexer struct {