commit 4189ebdbd5cc51996430f7ce6520eb3879b5ded0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 11 00:05:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 11 00:05:54 2023 +0000
tree c35012549b821a49e0f5669e44daa4e9af244b73
parent e9f33e5975a40e40014cb9f70ddd06a66a01f0c0
parent c297bae6791d3bf163d43b8df2b61eb7b03e7a6a

Merge "Re-enable checks that pass in udc-dev-plus-aosp and downstream" into udc-dev-plus-aosp am: b2ddb1dba6 am: bbfb393d25 am: c297bae679

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

Change-Id: I89f272f444615a3928d3fcfa4d0fc19e6175b590
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 eb89493..0aa828e 100644
--- a/android/config.go
+++ b/android/config.go
@@ -653,9 +653,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/aapt2.go

diff --git a/java/aapt2.go b/java/aapt2.go
index 3bb70b5..aa0eb7f 100644
--- a/java/aapt2.go
+++ b/java/aapt2.go
@@ -283,7 +283,8 @@
 
 var aapt2ConvertRule = pctx.AndroidStaticRule("aapt2Convert",
 	blueprint.RuleParams{
-		Command:     `${config.Aapt2Cmd} convert --output-format $format $in -o $out`,
+		Command: `${config.Aapt2Cmd} convert --enable-compact-entries ` +
+			`--output-format $format $in -o $out`,
 		CommandDeps: []string{"${config.Aapt2Cmd}"},
 	}, "format",
 )

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index 1e38efc..19b4039 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -191,6 +191,8 @@
 	// 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
 	assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets")
 	resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Resource_dirs, "res")

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