Merge "Fix single value variable inheritance order" am: 52233be25c am: e7951493a1 am: 4a5e47d83b am: 0f7ccf239b am: 1d7c54da91 am: 858bb49e92
Original change: https://android-review.googlesource.com/c/platform/build/+/2054306
Change-Id: I2d723cb4d68373a674d8001a18f3e322483731db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/OWNERS b/core/OWNERS
index 8794434..4873e8b 100644
--- a/core/OWNERS
+++ b/core/OWNERS
@@ -2,5 +2,5 @@
per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,skvadrik@google.com
# For version updates
-per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com
+per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,sberbary@google.com,jainne@google.com
diff --git a/core/build_id.mk b/core/build_id.mk
index a489788..2f9c3f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=TM
+BUILD_ID=MASTER
diff --git a/core/generate_enforce_rro.mk b/core/generate_enforce_rro.mk
index 9079981..ed258cc 100644
--- a/core/generate_enforce_rro.mk
+++ b/core/generate_enforce_rro.mk
@@ -38,7 +38,7 @@
LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)
-LOCAL_AAPT_FLAGS += --auto-add-overlay
+LOCAL_AAPT_FLAGS += --auto-add-overlay --keep-raw-values
LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays)
ifeq (product,$(enforce_rro_partition))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 7603b96..2c00c16 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -58,7 +58,7 @@
# This is the user-visible version. In a final release build it should
# be empty to use PLATFORM_VERSION as the user-visible version. For
# a preview release it can be set to a user-friendly value like `12 Preview 1`
-PLATFORM_DISPLAY_VERSION := 13
+PLATFORM_DISPLAY_VERSION :=
ifndef PLATFORM_SDK_VERSION
# This is the canonical definition of the SDK version, which defines
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index ae80b37..6874f39 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -60,6 +60,7 @@
VNDK-SP: libz.so
VNDK-core: android.hardware.audio.common-V1-ndk.so
VNDK-core: android.hardware.audio.common@2.0.so
+VNDK-core: android.hardware.audio.core-V1-ndk.so
VNDK-core: android.hardware.authsecret-V1-ndk.so
VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
VNDK-core: android.hardware.bluetooth.audio-V1-ndk.so