lake: Split system_ext and vendor props

Change-Id: Iee726d7d95d2bc4abb14fcfdffc55a04aca6e1cc

BoardConfig.mk

@@ -60,6 +60,10 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 939524096
 # Power
 TARGET_HAS_NO_WLAN_STATS := true
 
+# Properties
+TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
+TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
+
 # Recovery
 TARGET_RECOVERY_UI_BLANK_UNBLANK_ON_INIT := true
 

device.mk

@@ -17,9 +17,6 @@
 # Vendor blobs
 $(call inherit-product, vendor/motorola/lake/lake-vendor.mk)
 
-# Properties
--include $(LOCAL_PATH)/vendor_prop.mk
-
 PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := true
 
 # Overlays

system_ext.prop

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

vendor.prop

@@ -0,0 +1,49 @@
+#
+# vendor props for lake
+#
+
+# Audio
+persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb
+persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb
+persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb
+persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_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/Handset_cal.acdb
+persist.vendor.audio.default.spkrdc=9929
+persist.vendor.audio.default.rcvrdc=11243
+
+# Camera
+persist.vendor.camera.expose.aux=1
+vendor.video.disable.ubwc=1
+
+# Fluence
+PRODUCT_PROPERTY_OVERRIDES +=
+persist.vendor.audio.dualmic.config=endfire
+persist.vendor.audio.fluence.audiorec=false
+persist.vendor.audio.fluence.speaker=false
+persist.vendor.audio.fluence.voicecall=false
+persist.vendor.audio.fluence.voicecomm=true
+persist.vendor.audio.fluence.voicerec=false
+ro.vendor.audio.sdk.fluencetype=none
+
+# FM
+ro.vendor.fm.use_audio_session=true
+
+# Keymaster 4.0 - TDES support
+ro.hardware.keystore_desede=true
+
+# Sensors
+ro.hardware.sensors=lake
+ro.vendor.sensors.maghalcal=true
+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,55 +0,0 @@
-#
-# vendor props for lake
-#
-
-# Audio
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb \
-    persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
-    persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb \
-    persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_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/Handset_cal.acdb \
-    persist.vendor.audio.default.spkrdc=9929 \
-    persist.vendor.audio.default.rcvrdc=11243
-
-# Camera
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.camera.expose.aux=1 \
-    vendor.video.disable.ubwc=1
-
-# Fluence
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.dualmic.config=endfire \
-    persist.vendor.audio.fluence.audiorec=false \
-    persist.vendor.audio.fluence.speaker=false \
-    persist.vendor.audio.fluence.voicecall=false \
-    persist.vendor.audio.fluence.voicecomm=true \
-    persist.vendor.audio.fluence.voicerec=false \
-    ro.qc.sdk.audio.fluencetype=none \
-    ro.vendor.audio.sdk.fluencetype=none
-
-# FM
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.fm.use_audio_session=true
-
-# Keymaster 4.0 - TDES support
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.keystore_desede=true
-
-# Sensors
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.sensors=lake \
-    ro.vendor.sensors.maghalcal=true \
-    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