Move away from system_prop.mk in favor of system.prop

* Using a makefile does not improve anything, only adds useless syntax

4 files changed, 149 insertions, 172 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 56d90d0..ebe1269 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,6 +42,9 @@ TARGET_NO_BOOTLOADER := true
 TARGET_BOARD_PLATFORM := msm8996
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno530
 
+# Properties
+TARGET_SYSTEM_PROP += $(PLATFORM_PATH)/system.prop
+
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
diff --git a/device.mk b/device.mk
index 2388a66..50894ff 100755
--- a/device.mk
+++ b/device.mk
@@ -23,10 +23,6 @@
 
 $(call inherit-product-if-exists, vendor/zuk/z2_plus/z2_plus-vendor.mk)
 
-
-# System properties
--include $(LOCAL_PATH)/system_prop.mk
-
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
diff --git a/system.prop b/system.prop
new file mode 100644
index 0000000..6339642
--- /dev/null
+++ b/system.prop
@@ -0,0 +1,146 @@
+# Audio
+audio_hal.period_size=192
+audio.deep_buffer.media=true
+audio.offload.buffer.size.kb=32
+audio.offload.gapless.enabled=true
+audio.offload.multiaac.enable=true
+audio.offload.multiple.enabled=true
+audio.offload.pcm.16bit.enable=true
+audio.offload.pcm.24bit.enable=true
+audio.offload.track.enable=false
+audio.offload.video=true
+audio.safx.pbe.enabled=true
+audio.parser.ip.buffer.size=262144
+audio.dolby.ds2.enabled=false
+audio.dolby.ds2.hardbypass=false
+use.voice.path.for.pcm.voip=true
+ro.qc.sdk.audio.ssr=false
+ro.qc.sdk.audio.fluencetype=fluence
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=false
+persist.audio.fluence.speaker=true
+tunnel.audio.encode=false
+
+# Bluetooth
+bt.max.hfpclient.connections=1
+qcom.bluetooth.soc=rome
+ro.bluetooth.emb_wp_mode=true
+ro.bluetooth.wipower=true
+
+# Camera
+persist.camera.imglib.fddsp=1
+persist.camera.llc=1
+persist.camera.llnoise=1
+persist.camera.stats.test=0
+camera.disable_zsl_mode=1
+
+# CNE
+persist.cne.feature=1
+
+# Data modules
+persist.data.mode=concurrent
+persist.data.netmgrd.qos.enable=true
+ro.use_data_netmgrd=true
+persist.data.iwlan.enable=true
+
+# Display (Qualcomm AD)
+ro.qualcomm.cabl=2
+ro.qcom.ad=1
+ro.qcom.ad.calib.data=/system/etc/calib.cfg
+ro.qcom.ad.sensortype=2
+
+# Fingerprint
+persist.qfp=false
+
+# Flip panel
+persist.panel.inversemounted=1
+ro.panel.mountflip=3
+
+# Google
+ro.opa.eligible_device=true
+
+# Graphics
+debug.egl.hw=1
+debug.gralloc.enable_fb_ubwc=1
+debug.sf.hw=1
+dev.pm.dyn_samplingrate=1
+persist.demo.hdmirotationlock=false
+persist.hwc.enable_vds=1
+ro.opengles.version=196610
+ro.sf.lcd_density=480
+sdm.debug.disable_rotator_split=1
+sdm.perf_hint_window=50
+
+# GPS
+persist.gps.qc_nlp_in_use=1
+persist.loc.nlp_name=com.qualcomm.location
+ro.gps.agps_provider=1
+
+# Hdmi
+persist.speaker.prot.enable=true
+qcom.hw.aac.encoder=true
+
+# Media
+flac.sw.decoder.24bit.support=true
+media.aac_51_output_enabled=true
+mm.enable.smoothstreaming=true
+use.qti.sw.alac.decoder=true
+use.qti.sw.ape.decoder=true
+
+# NITZ
+persist.rild.nitz_plmn=""
+persist.rild.nitz_long_ons_0=""
+persist.rild.nitz_long_ons_1=""
+persist.rild.nitz_long_ons_2=""
+persist.rild.nitz_long_ons_3=""
+persist.rild.nitz_short_ons_0=""
+persist.rild.nitz_short_ons_1=""
+persist.rild.nitz_short_ons_2=""
+persist.rild.nitz_short_ons_3=""
+
+# Perf
+ro.am.reschedule_service=true
+ro.min_freq_0=307200
+ro.min_freq_4=307200
+ro.sys.fw.bg_apps_limit=60
+ro.vendor.extension_library=libqti-perfd-client.so
+
+# Radio
+DEVICE_PROVISIONED=1
+rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
+ril.subscription.types=NV,RUIM
+ro.telephony.default_network=22,22
+ro.telephony.default_cdma_sub=0
+ro.telephony.call_ring.multiple=false
+persist.data.qmi.adb_logmask=0
+persist.dbg.volte_avail_ovr=1
+persist.dbg.vt_avail_ovr=1
+persist.net.doxlat=true
+persist.radio.add_power_save=1
+persist.radio.apm_sim_not_pwdn=1
+persist.radio.custom_ecc=1
+persist.radio.flexmap_type=dds
+persist.radio.force_on_dc=true
+persist.radio.multisim.config=dsds
+persist.radio.primarycard=true
+persist.radio.rat_on=combine
+persist.radio.sib16_support=1
+persist.radio.sw_mbn_volte=1
+persist.radio.sw_mbn_openmkt=1
+
+# RmNet Data
+persist.rmnet.data.enable=true
+persist.data.wda.enable=true
+persist.data.df.dl_mode=5
+persist.data.df.ul_mode=5
+persist.data.df.agg.dl_pkt=10
+persist.data.df.agg.dl_size=4096
+persist.data.df.mux_count=8
+persist.data.df.iwlan_mux=9
+persist.data.df.dev_name=rmnet_usb0
+
+# Storage
+persist.fuse_sdcard=true
+
+# TimeService
+persist.timed.enable=true
diff --git a/system_prop.mk b/system_prop.mk
deleted file mode 100644
index 15dfa5f..0000000
--- a/system_prop.mk
+++ /dev/null
@@ -1,168 +0,0 @@
-# Audio
-PRODUCT_PROPERTY_OVERRIDES += \
-    audio_hal.period_size=192 \
-    audio.deep_buffer.media=true \
-    audio.offload.buffer.size.kb=32 \
-    audio.offload.gapless.enabled=true \
-    audio.offload.multiaac.enable=true \
-    audio.offload.multiple.enabled=true \
-    audio.offload.pcm.16bit.enable=true \
-    audio.offload.pcm.24bit.enable=true \
-    audio.offload.track.enable=false \
-    audio.offload.video=true \
-    audio.safx.pbe.enabled=true \
-    audio.parser.ip.buffer.size=262144 \
-    audio.dolby.ds2.enabled=false \
-    audio.dolby.ds2.hardbypass=false \
-    use.voice.path.for.pcm.voip=true
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.qc.sdk.audio.ssr=false \
-    ro.qc.sdk.audio.fluencetype=fluence \
-    persist.audio.fluence.voicecall=true \
-    persist.audio.fluence.voicerec=false \
-    persist.audio.fluence.speaker=true \
-    tunnel.audio.encode=false
-
-# Bluetooth
-PRODUCT_PROPERTY_OVERRIDES += \
-    bt.max.hfpclient.connections=1 \
-    qcom.bluetooth.soc=rome \
-    ro.bluetooth.emb_wp_mode=true \
-    ro.bluetooth.wipower=true 
-
-# Camera
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.camera.imglib.fddsp=1 \
-    persist.camera.llc=1 \
-    persist.camera.llnoise=1 \
-    persist.camera.stats.test=0 \
-    camera.disable_zsl_mode=1
-
-# CNE
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.cne.feature=1
-
-# Data modules
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.data.mode=concurrent \
-    persist.data.netmgrd.qos.enable=true \
-    ro.use_data_netmgrd=true \
-    persist.data.iwlan.enable=true
-
-# Display (Qualcomm AD)
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.qualcomm.cabl=2 \
-    ro.qcom.ad=1 \
-    ro.qcom.ad.calib.data=/system/etc/calib.cfg \
-    ro.qcom.ad.sensortype=2
-
-# Fingerprint
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.qfp=false 
-
-# Flip panel
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.panel.inversemounted=1 \
-    ro.panel.mountflip=3
-
-# Google
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.opa.eligible_device=true
-
-# Graphics
-PRODUCT_PROPERTY_OVERRIDES += \
-    debug.egl.hw=1 \
-    debug.gralloc.enable_fb_ubwc=1 \
-    debug.sf.hw=1 \
-    dev.pm.dyn_samplingrate=1 \
-    persist.demo.hdmirotationlock=false \
-    persist.hwc.enable_vds=1 \
-    ro.opengles.version=196610 \
-    ro.sf.lcd_density=480 \
-    sdm.debug.disable_rotator_split=1 \
-    sdm.perf_hint_window=50
-
-# GPS
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.gps.qc_nlp_in_use=1 \
-    persist.loc.nlp_name=com.qualcomm.location \
-    ro.gps.agps_provider=1
-
-# Hdmi
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.speaker.prot.enable=true \
-    qcom.hw.aac.encoder=true
-
-# Media
-PRODUCT_PROPERTY_OVERRIDES += \
-    flac.sw.decoder.24bit.support=true\
-    media.aac_51_output_enabled=true \
-    mm.enable.smoothstreaming=true \
-    use.qti.sw.alac.decoder=true \
-    use.qti.sw.ape.decoder=true
-
-
-# NITZ
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.rild.nitz_plmn="" \
-    persist.rild.nitz_long_ons_0="" \
-    persist.rild.nitz_long_ons_1="" \
-    persist.rild.nitz_long_ons_2="" \
-    persist.rild.nitz_long_ons_3="" \
-    persist.rild.nitz_short_ons_0="" \
-    persist.rild.nitz_short_ons_1="" \
-    persist.rild.nitz_short_ons_2="" \
-    persist.rild.nitz_short_ons_3=""
-
-# Perf
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.am.reschedule_service=true \
-    ro.min_freq_0=307200 \
-    ro.min_freq_4=307200 \
-    ro.sys.fw.bg_apps_limit=60 \
-    ro.vendor.extension_library=libqti-perfd-client.so
-
-# Radio
-PRODUCT_PROPERTY_OVERRIDES += \
-    DEVICE_PROVISIONED=1 \
-    rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \
-    ril.subscription.types=NV,RUIM \
-    ro.telephony.default_network=22,22 \
-    ro.telephony.default_cdma_sub=0 \
-    ro.telephony.call_ring.multiple=false \
-    persist.data.qmi.adb_logmask=0 \
-    persist.dbg.volte_avail_ovr=1 \
-    persist.dbg.vt_avail_ovr=1 \
-    persist.net.doxlat=true \
-    persist.radio.add_power_save=1 \
-    persist.radio.apm_sim_not_pwdn=1 \
-    persist.radio.custom_ecc=1 \
-    persist.radio.flexmap_type=dds \
-    persist.radio.force_on_dc=true \
-    persist.radio.multisim.config=dsds \
-    persist.radio.primarycard=true \
-    persist.radio.rat_on=combine \
-    persist.radio.sib16_support=1 \
-    persist.radio.sw_mbn_volte=1 \
-    persist.radio.sw_mbn_openmkt=1
-
-# RmNet Data
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.rmnet.data.enable=true \
-    persist.data.wda.enable=true \
-    persist.data.df.dl_mode=5 \
-    persist.data.df.ul_mode=5 \
-    persist.data.df.agg.dl_pkt=10 \
-    persist.data.df.agg.dl_size=4096 \
-    persist.data.df.mux_count=8 \
-    persist.data.df.iwlan_mux=9 \
-    persist.data.df.dev_name=rmnet_usb0
-
-# Storage
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.fuse_sdcard=true
-
-# TimeService
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.timed.enable=true