sdm845-common: Split system_prop to {product,system}.prop

Change-Id: I6467e54268aa2e07275263d3aedee50730d7467d
Signed-off-by: Anirudh Gupta <anirudhgupta109@aosip.dev>

BoardConfigCommon.mk

@@ -60,6 +60,8 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno630
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 
 # Treble
 BOARD_VNDK_VERSION := current

common.mk

@@ -33,8 +33,6 @@ PRODUCT_PACKAGES += \
     OnePlusIconShapeTeardropOverlay
 
 # Properties
--include $(LOCAL_PATH)/system_prop.mk
-
 PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
 
 # VNDK

product.prop

@@ -0,0 +1,3 @@
+# Audio
+ro.config.media_vol_steps=25
+ro.config.vc_call_vol_steps=7

system.prop

@@ -0,0 +1,57 @@
+# Audio
+audio.offload.min.duration.secs=30
+persist.vendor.audio.hac.enable=false
+persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
+
+# Camera
+camera.disable_zsl_mode=true
+
+# Display
+debug.gralloc.gfx_ubwc_disable=0
+debug.sf.enable_hwc_vds=1
+debug.sf.latch_unsignaled=1
+persist.vendor.color.matrix=2
+
+# CNE
+persist.vendor.cne.feature=1
+
+# DPM
+persist.vendor.dpm.feature=9
+
+# IMS
+persist.dbg.volte_avail_ovr=1
+persist.dbg.vt_avail_ovr=1
+persist.dbg.wfc_avail_ovr=1
+
+# IOP
+vendor.iop.enable_prefetch_ofr=1
+vendor.iop.enable_uxe=0
+
+# Media
+media.settings.xml=/system/etc/media_profiles_vendor.xml
+
+# Perf
+ro.vendor.qti.core_ctl_max_cpu=4
+ro.vendor.qti.core_ctl_min_cpu=2
+
+# Radio
+persist.vendor.radio.bar_fake_gcell=1
+persist.vendor.radio.data_con_rprt=1
+persist.vendor.radio.data_ltd_sys_ind=1
+persist.vendor.radio.force_on_dc=true
+persist.vendor.radio.ignore_dom_time=10
+ro.telephony.default_network=22,22
+
+# Touchscreen
+persist.vendor.qti.inputopts.enable=true
+persist.vendor.qti.inputopts.movetouchslop=0.6
+
+# Netmgr
+persist.vendor.data.iwlan.enable=true
+persist.vendor.data.mode=concurrent
+
+# SSR
+persist.vendor.ssr.restart_level=ALL_ENABLE
+
+# Vendor
+ro.vendor.qti.va_aosp.support=1

system_prop.mk

@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Audio
-PRODUCT_PROPERTY_OVERRIDES += \
-    audio.offload.min.duration.secs=30 \
-    persist.vendor.audio.hac.enable=false \
-    persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
-
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.media_vol_steps=25 \
-    ro.config.vc_call_vol_steps=7
-
-# Camera
-PRODUCT_PROPERTY_OVERRIDES += \
-    camera.disable_zsl_mode=true
-
-# Display
-PRODUCT_PROPERTY_OVERRIDES += \
-    debug.gralloc.gfx_ubwc_disable=0 \
-    debug.sf.enable_hwc_vds=1 \
-    debug.sf.latch_unsignaled=1 \
-    persist.vendor.color.matrix=2
-
-# CNE
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.cne.feature=1
-
-# DPM
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.dpm.feature=9
-
-# IMS
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.dbg.volte_avail_ovr=1 \
-    persist.dbg.vt_avail_ovr=1  \
-    persist.dbg.wfc_avail_ovr=1
-
-# IOP
-PRODUCT_PROPERTY_OVERRIDES += \
-    vendor.iop.enable_prefetch_ofr=1 \
-    vendor.iop.enable_uxe=0
-
-# Media
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.settings.xml=/system/etc/media_profiles_vendor.xml
-
-# Perf
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.qti.core_ctl_max_cpu=4 \
-    ro.vendor.qti.core_ctl_min_cpu=2
-
-# Radio
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.radio.bar_fake_gcell=1 \
-    persist.vendor.radio.data_con_rprt=1 \
-    persist.vendor.radio.data_ltd_sys_ind=1 \
-    persist.vendor.radio.force_on_dc=true \
-    persist.vendor.radio.ignore_dom_time=10 \
-    ro.telephony.default_network=22,22
-
-# Touchscreen
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.qti.inputopts.enable=true \
-    persist.vendor.qti.inputopts.movetouchslop=0.6
-
-# Netmgr
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.data.iwlan.enable=true \
-    persist.vendor.data.mode=concurrent
-
-# SSR
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.ssr.restart_level=ALL_ENABLE
-
-# Vendor
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.qti.va_aosp.support=1