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

Commit 6255f032 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Bruno Martins
Browse files

lineage: Move all system props to PRODUCT_GENERIC_PROPERTIES

For Treble enabled devices, PRODUCT_PROPERTY_OVERRIDES puts props
added with that in /vendor/build.prop. While that's great for
device-specific properties, these are global Lineage properties
which are descriptive of the system side, so move them to the list
that gets populated into /system/build.prop.

Change-Id: I8bb3d0fe13188478d4f7dedc306740a40f44a3e8
parent 546c9a1e
Loading
Loading
Loading
Loading
+11 −11
Original line number Diff line number Diff line
@@ -3,27 +3,27 @@ PRODUCT_BRAND ?= LineageOS
PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0

ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.com.google.clientidbase=android-google
else
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
endif

PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    keyguard.no_require_sim=true

PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.build.selinux=1

# Default notification/alarm sounds
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.config.notification_sound=Argon.ogg \
    ro.config.alarm_alert=Hassium.ogg

ifneq ($(TARGET_BUILD_VARIANT),user)
# Thank you, please drive thru!
PRODUCT_PROPERTY_OVERRIDES += persist.sys.dun.override=0
PRODUCT_GENERIC_PROPERTIES += persist.sys.dun.override=0
endif

ifneq ($(TARGET_BUILD_VARIANT),eng)
@@ -226,16 +226,16 @@ PRODUCT_PACKAGES += \
    libffmpeg_omx \
    media_codecs_ffmpeg.xml

PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    media.sf.omx-plugin=libffmpeg_omx.so \
    media.sf.extractor-plugin=libffmpeg_extractor.so

# Storage manager
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.storage_manager.enabled=true

# Media
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    media.recorder.show_manufacturer_and_model=true

# These packages are excluded from user builds
@@ -341,7 +341,7 @@ else
    endif
endif

PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.lineage.version=$(LINEAGE_VERSION) \
    ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
@@ -378,7 +378,7 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
endif
endif

PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION)

-include $(WORKSPACE)/build_env/image-auto-bits.mk
+2 −2
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ ifndef LINEAGE_PLATFORM_REV
endif

# LineageOS Platform SDK Version
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
  ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)

# LineageOS Platform Internal
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
  ro.lineage.build.version.plat.rev=$(LINEAGE_PLATFORM_REV)
+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ PRODUCT_PACKAGES += \
    CellBroadcastReceiver

# Default ringtone
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    ro.config.ringtone=Orion.ogg

# Tethering - allow without requiring a provisioning app
# (for devices that check this)
PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_GENERIC_PROPERTIES += \
    net.tethering.noprovisioning=true