commit 9f3651e7bc7c54a66baf1644dddd447644d01404
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 20 05:34:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 05:34:50 2023 +0000
tree 85d978d368418477057045a57953e75ab637eb45
parent 916b0d1cafd40e2f369997d77506eef387c449b0
parent 6a9453d1582367759a6e42cded91e40d1775aa26

Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb am: b9c4cf09f7 am: 33ddef6dae am: 6a9453d158

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: I1c69c1c36bef432b4a1cb880188d0fa8caa8c4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/config.go

diff --git a/android/config.go b/android/config.go
index 9cfbc9e..6adcf54 100644
--- a/android/config.go
+++ b/android/config.go
@@ -633,9 +633,12 @@
 		"framework-adservices":              {},
 		"framework-appsearch":               {},
 		"framework-bluetooth":               {},
+		"framework-configinfrastructure":    {},
 		"framework-connectivity":            {},
 		"framework-connectivity-t":          {},
+		"framework-devicelock":              {},
 		"framework-graphics":                {},
+		"framework-healthfitness":           {},
 		"framework-media":                   {},
 		"framework-mediaprovider":           {},
 		"framework-ondevicepersonalization": {},

android/updatable_modules.go

diff --git a/android/updatable_modules.go b/android/updatable_modules.go
index 6d0eeb7..1548170 100644
--- a/android/updatable_modules.go
+++ b/android/updatable_modules.go
@@ -33,4 +33,4 @@
 // * AOSP            - xx9990000
 // * x-mainline-prod - xx9990000
 // * master          - 990090000
-const DefaultUpdatableModuleVersion = "340090000"
+const DefaultUpdatableModuleVersion = "990090000"

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index c9e08e2..95b9a67 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")

mk2rbc/test/version_defaults.mk.test

diff --git a/mk2rbc/test/version_defaults.mk.test b/mk2rbc/test/version_defaults.mk.test
index 1666392..3ce60bc 100644
--- a/mk2rbc/test/version_defaults.mk.test
+++ b/mk2rbc/test/version_defaults.mk.test
@@ -3,8 +3,8 @@
   include $(INTERNAL_BUILD_ID_MAKEFILE)
 endif
 
-DEFAULT_PLATFORM_VERSION := TP1A
-.KATI_READONLY := DEFAULT_PLATFORM_VERSION
+RELEASE_PLATFORM_VERSION := TP1A
+.KATI_READONLY := RELEASE_PLATFORM_VERSION
 MIN_PLATFORM_VERSION := TP1A
 MAX_PLATFORM_VERSION := TP1A
 PLATFORM_VERSION_LAST_STABLE := 12