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

Commit b6fb3e15 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Rashed Abdel-Tawab
Browse files

lineage: Move to Google's method of defining system default props

PRODUCT_SYSTEM_DEFAULT_PROPERTIES can now be used to define system default
properties which should be installed in system partition.

Those props are stored in /system/etc/prop.default.

Change-Id: I6cb0e28a7599b010b389cc541015a37010a00f4b
parent 56030be8
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_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
    ro.com.google.clientidbase=android-google
else
PRODUCT_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
    ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
endif

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

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

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

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

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

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

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

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

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

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

PRODUCT_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_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_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
  ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)

# LineageOS Platform Internal
PRODUCT_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_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_GENERIC_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
    ro.config.ringtone=Orion.ogg

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