From 40eab20c34ca2084d030f0af3ef3b5a237263df3 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 30 Mar 2023 16:57:17 +0000 Subject: [PATCH] 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/java/aar.go b/java/aar.go index 47e6efae3..4fdcb80b8 100644 --- a/java/aar.go +++ b/java/aar.go @@ -176,6 +176,7 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte 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")