Snap for 11275524 from bd8c454d32 to 24Q2-release

Change-Id: I7bd155e235195b12b19cf7b8d542166b7d156f68
This commit is contained in:
Android Build Coastguard Worker 2024-01-05 00:03:41 +00:00
commit 13c4cfcf23
2 changed files with 4 additions and 6 deletions

View file

@ -63,6 +63,4 @@ PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off
else
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.chrome=off
endif

View file

@ -1027,11 +1027,11 @@ PRODUCT_PACKAGES += \
# Audio
# Audio HAL Server & Default Implementations
#ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
#include device/google/gs-common/audio/aidl.mk
#else
ifeq ($(USE_AUDIO_HAL_AIDL),true)
include device/google/gs-common/audio/aidl.mk
else
include device/google/gs-common/audio/hidl_zuma.mk
#endif
endif
## AoC soong
PRODUCT_SOONG_NAMESPACES += \