commit 37b8d278b23ea72349721a86cf90351f775d6929
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 21 16:14:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 21 16:14:55 2022 +0000
tree c51d44842a494bf79b0586c31b1b5b8f7f73cc34
parent 66dca6846b05fe828352d6dabd1bac8c03b58908
parent cc1e456252e5cfc3643fc365d8d590674ed9cfa3

Merge "Make change and version bump to TKB1.221021.002" into gki13-boot-release

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 52dbf58..8804ba6 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=TKB1.221021.001
+BUILD_ID=TKB1.221021.002

target/product/gsi_release.mk

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 9c480b6..20493be 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -62,6 +62,11 @@
     init.gsi.rc \
     init.vndk-nodef.rc \
 
+# Overlay the GSI specific SystemUI setting
+PRODUCT_PACKAGES += gsi_overlay_systemui
+PRODUCT_COPY_FILES += \
+    device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml
+
 # Support additional VNDK snapshots
 PRODUCT_EXTRA_VNDK_VERSIONS := \
     29 \