StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: Move audio includes back to mobile

Browse Source 
Emulator (cuttlefish) is inherited and sets default sound properties,
which conflict at build time with Lineage defaults, breaking `car_gsi`
targets.

Change-Id: I3fb099a77394f8eb4613445c2410d7f568b8a3f5
This commit is contained in:
Nolen Johnson
2024-02-11 13:59:17 -05:00
committed by Bruno Martins
parent 5c5c497acd
commit afb819d70c
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/common.mk
View File

@@ -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) $(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 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 # Bootanimation
TARGET_SCREEN_WIDTH ?= 1080 TARGET_SCREEN_WIDTH ?= 1080
TARGET_SCREEN_HEIGHT ?= 1920 TARGET_SCREEN_HEIGHT ?= 1920

11
config/common_mobile.mk
View File

@@ -1,6 +1,17 @@
# Inherit common mobile Lineage stuff # Inherit common mobile Lineage stuff
$(call inherit-product, vendor/lineage/config/common.mk) $(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 # Apps
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Backgrounds Backgrounds