commit 40eab20c34ca2084d030f0af3ef3b5a237263df3
author Eric Miao <ericymiao@google.com> Thu Mar 30 16:57:17 2023 +0000
committer Eric Miao <ericymiao@google.com> Thu Mar 30 16:57:37 2023 +0000
tree c126152910b4fb8bb4da0f5f5b4c2c838d395b07
parent 69862e62faec250471c8d9b2dbadb0e3ee0100d7

Revert "Revert "Enable compact resource entries for aapt linking""

This reverts commit 825cff4169ef07880ae4ba51b978873ed276eb73.

Reason for revert: Failed test has been fixed - b/275572186

Change-Id: I661206f4e0e783a5c403ac15ed33a93ba3acaf40

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index 47e6efa..4fdcb80 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -176,6 +176,7 @@
 	linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...)
 
 	linkFlags = append(linkFlags, "--no-static-lib-packages")
+	linkFlags = append(linkFlags, "--enable-compact-entries")
 
 	// Find implicit or explicit asset and resource dirs
 	assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets")