From afb819d70c518dc1ac8e68cf00bbb3526b239672 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Sun, 11 Feb 2024 13:59:17 -0500 Subject: [PATCH] config: Move audio includes back to mobile Emulator (cuttlefish) is inherited and sets default sound properties, which conflict at build time with Lineage defaults, breaking `car_gsi` targets. Change-Id: I3fb099a77394f8eb4613445c2410d7f568b8a3f5 --- config/common.mk | 13 ------------- config/common_mobile.mk | 11 +++++++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/config/common.mk b/config/common.mk index ccfe6b21..7ea412e8 100644 --- a/config/common.mk +++ b/config/common.mk @@ -95,19 +95,6 @@ ifneq ($(TARGET_DISABLE_EPPE),true) $(call enforce-product-packages-exist-internal,$(wildcard device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package) endif -ifeq ($(PRODUCT_IS_ATV),) -# Include AOSP audio files -include vendor/lineage/config/aosp_audio.mk - -# Include Lineage audio files -include vendor/lineage/config/lineage_audio.mk - -# Default notification/alarm sounds -PRODUCT_PRODUCT_PROPERTIES += \ - ro.config.notification_sound=Argon.ogg \ - ro.config.alarm_alert=Hassium.ogg -endif - # Bootanimation TARGET_SCREEN_WIDTH ?= 1080 TARGET_SCREEN_HEIGHT ?= 1920 diff --git a/config/common_mobile.mk b/config/common_mobile.mk index e4003164..3bbd3dbc 100644 --- a/config/common_mobile.mk +++ b/config/common_mobile.mk @@ -1,6 +1,17 @@ # Inherit common mobile Lineage stuff $(call inherit-product, vendor/lineage/config/common.mk) +# Include AOSP audio files +include vendor/lineage/config/aosp_audio.mk + +# Include Lineage audio files +include vendor/lineage/config/lineage_audio.mk + +# Default notification/alarm sounds +PRODUCT_PRODUCT_PROPERTIES += \ + ro.config.notification_sound=Argon.ogg \ + ro.config.alarm_alert=Hassium.ogg + # Apps PRODUCT_PACKAGES += \ Backgrounds