aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Harrison <khwebmail@gmail.com>2020-04-15 20:19:07 +0530
committeralthafvly <althafvly@gmail.com>2020-06-06 13:53:55 +0530
commitb55b66f8be1be71ee8fce9eabe120653e1acdc4c (patch)
tree4a05dcf63a25219e817236e1f487b2ca4b0c1894
parent8f2195d191e007e3bff6bd4e42d29571760be12b (diff)
merlin: Migrate from system.prop to system_prop.mk
Change-Id: Ieaf728683d49d2ae6dacb5a96f8da98468d1d169
-rw-r--r--BoardConfig.mk3
-rw-r--r--device.mk3
-rw-r--r--system.prop17
-rw-r--r--system_prop.mk19
4 files changed, 22 insertions, 20 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9d48c1a..364d0ba 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,8 +40,5 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2432696320 # 2375680 * 1024 mmcblk0p41
BOARD_PERSISTIMAGE_PARTITION_SIZE := 8388608 # 8192 * 1024 mmcblk0p29
BOARD_USERDATAIMAGE_PARTITION_SIZE := 12681347072 # 12384128 * 1024 mmcblk0p42
-# Properties
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
-
# Sensors
BOARD_USES_STML0XX_SENSOR_HUB := true
diff --git a/device.mk b/device.mk
index f96d383..3e13922 100644
--- a/device.mk
+++ b/device.mk
@@ -45,6 +45,9 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
PRODUCT_PACKAGES += \
init.target.rc
+# System Properties
+$(call inherit-product, device/motorola/merlin/system_prop.mk)
+
# Sensors
PRODUCT_PACKAGES += \
stml0xx \
diff --git a/system.prop b/system.prop
deleted file mode 100644
index d909206..0000000
--- a/system.prop
+++ /dev/null
@@ -1,17 +0,0 @@
-# system.prop for merlin
-
-# Audio
-persist.vendor.audio.fluence.mode=endfire
-persist.vendor.audio.fluence.voicecall=true
-ro.vendor.audio.sdk.fluencetype=fluence
-
-# Display
-ro.sf.lcd_density=320
-
-# Radio
-persist.radio.force_get_pref=1
-persist.radio.mot_ecc_custid=common
-persist.radio.mot_ecc_enabled=1
-persist.radio.multisim.config=dsds
-persist.radio.plmn_name_cmp=1
-ro.telephony.ril.config=simactivation
diff --git a/system_prop.mk b/system_prop.mk
new file mode 100644
index 0000000..1b0497f
--- /dev/null
+++ b/system_prop.mk
@@ -0,0 +1,19 @@
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+ persist.vendor.audio.fluence.mode=endfire \
+ persist.vendor.audio.fluence.voicecall=true \
+ ro.vendor.audio.sdk.fluencetype=fluence
+
+# Display
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.sf.lcd_density=320
+
+# Radio
+PRODUCT_PROPERTY_OVERRIDES += \
+ persist.radio.force_get_pref=1 \
+ persist.radio.mot_ecc_custid=common \
+ persist.radio.mot_ecc_enabled=1 \
+ persist.radio.multisim.config=dsds \
+ persist.radio.plmn_name_cmp=1 \
+ ro.telephony.ril.config=simactivation
+