beckham: Split system_ext and vendor props

Change-Id: Iee726d7d95d2bc4abb14fcfdffc55a04aca6e1cc

5 files changed, 46 insertions, 48 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 67890ff..c3c18ac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -50,6 +50,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
+
 # RIL
 ENABLE_VENDOR_RIL_SERVICE := true
 
diff --git a/device.mk b/device.mk
index 7650942..0db658f 100644
--- a/device.mk
+++ b/device.mk
@@ -17,9 +17,6 @@
 # Vendor blobs
 $(call inherit-product, vendor/motorola/beckham/beckham-vendor.mk)
 
-# Properties
--include $(LOCAL_PATH)/vendor_prop.mk
-
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 PRODUCT_ENFORCE_RRO_TARGETS := *
diff --git a/system_ext.prop b/system_ext.prop
new file mode 100644
index 0000000..3250b2c
--- /dev/null
+++ b/system_ext.prop
@@ -0,0 +1,2 @@
+# Audio
+ro.qc.sdk.audio.fluencetype=none
diff --git a/vendor.prop b/vendor.prop
new file mode 100644
index 0000000..fd9a9cd
--- /dev/null
+++ b/vendor.prop
@@ -0,0 +1,40 @@
+#
+# props for beckham
+#
+
+# 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=none
+
+# Mods
+sys.mod.platformsdkversion=281
+
+# Sensors
+ro.hardware.sensors=beckham
+ro.vendor.sensors.maghalcal=false
+ro.vendor.sensors.pmd=false
+ro.vendor.sensors.amd=false
+ro.vendor.sensors.rmd=false
+ro.vendor.sensors.scrn_ortn=false
+ro.vendor.sensors.pedometer=false
+ro.vendor.sensors.mot_ltv=true
+ro.vendor.sensors.facing=false
+ro.vendor.sensors.cmc=false
+ro.vendor.sensors.dev_ori=true
+ro.vendor.sensors.sta_detect=true
+ro.vendor.sensors.mot_detect=true
+ro.vendor.sdk.sensors.gestures=false
diff --git a/vendor_prop.mk b/vendor_prop.mk
deleted file mode 100644
index da2e8c1..0000000
--- a/vendor_prop.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# vendor props for beckham
-#
-
-# 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=none \
-    ro.vendor.audio.sdk.fluencetype=none
-
-# Mods
-PRODUCT_PROPERTY_OVERRIDES += \
-    sys.mod.platformsdkversion=281
-
-# Sensors
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.sensors=beckham \
-    ro.vendor.sensors.maghalcal=false \
-    ro.vendor.sensors.pmd=false \
-    ro.vendor.sensors.amd=false \
-    ro.vendor.sensors.rmd=false \
-    ro.vendor.sensors.scrn_ortn=false \
-    ro.vendor.sensors.pedometer=false \
-    ro.vendor.sensors.mot_ltv=true \
-    ro.vendor.sensors.facing=false \
-    ro.vendor.sensors.cmc=false \
-    ro.vendor.sensors.dev_ori=true \
-    ro.vendor.sensors.sta_detect=true \
-    ro.vendor.sensors.mot_detect=true \
-    ro.vendor.sdk.sensors.gestures=false