commit 916b0d1cafd40e2f369997d77506eef387c449b0
author Romain Jobredeaux <jobredeaux@google.com> Thu Jul 20 02:36:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 02:36:58 2023 +0000
tree 13a8d44810fa793c1182b79a8db83d9f655a51fe
parent 9e8916c34dc86afd21036d7b80f8040fb70ca492
parent 3a00841a5d6c059d1c3e61e7567f3ee48fb0cfc3

Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa am: 48ed4967a8 am: f4214eaa47 am: cc2fac2764 am: 3a00841a5d

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

Change-Id: I21991763b779117c52948726e25de23d01600178
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