commit b2302013ec44db5c0f97c48f87f223dad426143f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 20 16:17:17 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 20 16:17:17 2024 +0000
tree d04c51463e875db46f5570d25b085feea8091c96
parent 60713e6a7dc3d89c5064285681df7bd273151e54
parent 7c1c245214ec1b7f005f743e14b1fc27897f7b2a

Merge "Add cts-api-map report targets" into main

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 146479c..5befe62 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -336,7 +336,8 @@
 # Check if the build supports Profiling module
 ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)
     PRODUCT_PACKAGES += \
-       com.android.profiling
+       com.android.profiling \
+       trace_redactor
 endif
 
 ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true)

target/product/gsi_release.mk

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index da1284e..39428d2 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -51,9 +51,11 @@
     init.vndk-nodef.rc \
 
 
-# Overlay the GSI specific SystemUI setting
+# Overlay the GSI specific setting for framework and SystemUI
 ifneq ($(PRODUCT_IS_AUTOMOTIVE),true)
-    PRODUCT_PACKAGES += gsi_overlay_systemui
+    PRODUCT_PACKAGES += \
+        gsi_overlay_framework \
+        gsi_overlay_systemui \
     PRODUCT_COPY_FILES += \
         device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml
 endif