Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529 Merged-In: I763b033f0f5f275091db45ab62df6af48dcddc66 Change-Id: I65077e51b4a073f2628fb0995e80ad64368def26
2024-01-30 10:34:06 -08:00
parent 8e5eaf617a ce6f14cafe
commit 14a55a9b82
11 changed files with 351 additions and 9 deletions
--- a/java/aar.go
+++ b/java/aar.go
@@ -203,6 +203,8 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte
 	// Flags specified in Android.bp
 	linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...)

+	linkFlags = append(linkFlags, "--enable-compact-entries")
+
 	// Find implicit or explicit asset and resource dirs
 	assets := android.PathsRelativeToModuleSourceDir(android.SourceInput{
 		Context:     ctx,