Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224a5607 authored by Arne Coucheron's avatar Arne Coucheron Committed by Michael Bestas
Browse files

Fix inheritance of PRODUCT_PROPERTY_OVERRIDES for Lineage audio files 

Otherwise the ones set in Lineage vendor will be overridden by these.

Change-Id: I3f87dfd009d8ddfd48972c15770599742b12c4af

Author: Abhisek Devkota <ciwrl@cyanogenmod.com>
Remove extra product property overrides

This appears to clash with vendor/lineage/common mk's for overrides; causes
a broken default alarm (and OnTheHunt is so bleh).

Change-Id: I5ec990d3c5ad56b573c45f1a3b20169c989851a0
parent b46ccf61

target/product/full_base.mk

+2 −0
Original line number Diff line number Diff line
@@ -41,10 +41,12 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    netutils-wrapper-1.0



ifeq ($(LINEAGE_BUILD),)

# Additional settings used in all AOSP builds

PRODUCT_PROPERTY_OVERRIDES := \

    ro.config.ringtone=Ring_Synth_04.ogg \

    ro.config.notification_sound=pixiedust.ogg

endif



# Put en_US first in the list, so make it default.

PRODUCT_LOCALES := en_US

target/product/gsi_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ endif 
PRODUCT_PRODUCT_PROPERTIES += \

    ro.apex.updatable=false



ifeq ($(LINEAGE_BUILD),)

# Additional settings used in all AOSP builds

PRODUCT_PRODUCT_PROPERTIES += \

    ro.config.ringtone=Ring_Synth_04.ogg \

    ro.config.notification_sound=pixiedust.ogg \

endif



# The mainline checking whitelist, should be clean up

PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

target/product/handheld_system.mk

+4 −0
Original line number Diff line number Diff line
@@ -86,5 +86,9 @@ PRODUCT_COPY_FILES += \ 


PRODUCT_PROPERTY_OVERRIDES += \

    ro.carrier=unknown \



ifeq ($(LINEAGE_BUILD),)

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.notification_sound=OnTheHunt.ogg \

    ro.config.alarm_alert=Alarm_Classic.ogg

endif

target/product/mainline.mk

+4 −0
Original line number Diff line number Diff line
@@ -30,8 +30,12 @@ else 
$(call inherit-product, frameworks/base/data/sounds/AudioPackage14.mk)

endif



ifeq ($(LINEAGE_BUILD),)

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.ringtone=Ring_Synth_04.ogg \

endif



PRODUCT_PROPERTY_OVERRIDES += \

    ro.com.android.dataroaming=true \



PRODUCT_PACKAGES += \