From 8f354780e6c3648b26e04d396c227886da714d5c Mon Sep 17 00:00:00 2001
From: David Srbecky <dsrbecky@google.com>
Date: Tue, 14 Nov 2023 12:06:27 +0000
Subject: [PATCH] resourceshrinker: Add dexContainerExperiment flag

Bug: 249922554
Test: build with CL/2238838
Change-Id: I369ebe616caa9ae880b71abb0bafa3f909ebcdae
---
 java/resourceshrinker.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/resourceshrinker.go b/java/resourceshrinker.go
index bf1b04d94..af13aa3cb 100644
--- a/java/resourceshrinker.go
+++ b/java/resourceshrinker.go
@@ -23,7 +23,8 @@ import (
 var shrinkResources = pctx.AndroidStaticRule("shrinkResources",
 	blueprint.RuleParams{
 		// Note that we suppress stdout to avoid successful log confirmations.
-		Command:     `${config.ResourceShrinkerCmd} --output $out --input $in --raw_resources $raw_resources >/dev/null`,
+		Command: `RESOURCESHRINKER_OPTS=-Dcom.android.tools.r8.dexContainerExperiment ` +
+			`${config.ResourceShrinkerCmd} --output $out --input $in --raw_resources $raw_resources >/dev/null`,
 		CommandDeps: []string{"${config.ResourceShrinkerCmd}"},
 	}, "raw_resources")