payton: Split system_ext and vendor props

Change-Id: Iee726d7d95d2bc4abb14fcfdffc55a04aca6e1cc

BoardConfig.mk

@@ -52,5 +52,9 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 603979776
 # Power
 TARGET_HAS_NO_WLAN_STATS := true
 
+# Properties
+TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
+TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
+
 # inherit from the proprietary version
 include vendor/motorola/payton/BoardConfigVendor.mk

device.mk

@@ -118,6 +118,3 @@ $(call inherit-product, build/target/product/verity.mk)
 
 # Inherit from motorola sdm660-common
 $(call inherit-product, device/motorola/sdm660-common/common.mk)
-
-# Properties
--include $(LOCAL_PATH)/vendor_prop.mk

system_ext.prop

@@ -0,0 +1,2 @@
+# Audio
+ro.qc.sdk.audio.fluencetype=fluence

vendor.prop

@@ -0,0 +1,39 @@
+#
+# vendor props for payton
+#
+
+# Audio
+persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Bluetooth_cal.acdb
+persist.vendor.audio.calfile1=/vendor/etc/acdbdata/General_cal.acdb
+persist.vendor.audio.calfile2=/vendor/etc/acdbdata/Global_cal.acdb
+persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb
+persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb
+persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb
+persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb
+
+# Fluence
+persist.vendor.audio.dualmic.config=endfire
+persist.vendor.audio.fluence.audiorec=false
+persist.vendor.audio.fluence.speaker=true
+persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicecomm=true
+persist.vendor.audio.fluence.voicerec=false
+ro.vendor.audio.sdk.fluencetype=fluence
+
+# FM
+ro.vendor.fm.use_audio_session=true
+
+# Sensors
+ro.hardware.sensors=payton
+ro.vendor.sensors.maghalcal=false
+ro.vendor.sensors.amd=false
+ro.vendor.sensors.pmd=false
+ro.vendor.sensors.rmd=false
+ro.vendor.sensors.facing=false
+ro.vendor.sensors.scrn_ortn=false
+ro.vendor.sensors.pedometer=false
+ro.vendor.sensors.dev_ori=true
+ro.vendor.sensors.sta_detect=true
+ro.vendor.sensors.mot_detect=true
+ro.vendor.sensors.cmc=false
+ro.vendor.sdk.sensors.gestures=false

vendor_prop.mk

@@ -1,44 +0,0 @@
-#
-# vendor props for payton
-#
-
-# Audio
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
-    persist.vendor.audio.calfile1=/vendor/etc/acdbdata/General_cal.acdb \
-    persist.vendor.audio.calfile2=/vendor/etc/acdbdata/Global_cal.acdb \
-    persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb \
-    persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
-    persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
-    persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb
-
-# Fluence
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.dualmic.config=endfire \
-    persist.vendor.audio.fluence.audiorec=false \
-    persist.vendor.audio.fluence.speaker=true \
-    persist.vendor.audio.fluence.voicecall=true \
-    persist.vendor.audio.fluence.voicecomm=true \
-    persist.vendor.audio.fluence.voicerec=false \
-    ro.qc.sdk.audio.fluencetype=fluence \
-    ro.vendor.audio.sdk.fluencetype=fluence
-
-# FM
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.fm.use_audio_session=true
-
-# Sensors
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.sensors=payton \
-    ro.vendor.sensors.maghalcal=false \
-    ro.vendor.sensors.amd=false \
-    ro.vendor.sensors.pmd=false \
-    ro.vendor.sensors.rmd=false \
-    ro.vendor.sensors.facing=false \
-    ro.vendor.sensors.scrn_ortn=false \
-    ro.vendor.sensors.pedometer=false \
-    ro.vendor.sensors.dev_ori=true \
-    ro.vendor.sensors.sta_detect=true \
-    ro.vendor.sensors.mot_detect=true \
-    ro.vendor.sensors.cmc=false \
-    ro.vendor.sdk.sensors.gestures=false