shinano-common: Move system.prop to system_prop.mk

4 files changed, 63 insertions, 57 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fff4cbc..fe56047 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -78,9 +78,6 @@ TARGET_KEYMASTER_WAIT_FOR_QSEE := true
 BOARD_SEPOLICY_DIRS += \
     device/sony/shinano-common/sepolicy
 
-# Props for hotplugging
-TARGET_SYSTEM_PROP += device/sony/shinano-common/system.prop
-
 #Sensors
 USE_SENSOR_MULTI_HAL := true
 
diff --git a/shinano.mk b/shinano.mk
index 7b96976..9371c1c 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -164,6 +164,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     charger_res_images
 
+ # Properties
+include $(COMMON_PATH)/system_prop.mk
+
 # Sensor file
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/rootdir/system/vendor/bin/init.qcom-sensor.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom-sensor.sh
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 5a34cd6..0000000
--- a/system.prop
+++ /dev/null
@@ -1,54 +0,0 @@
-# Semc
-ro.semc.version.sw_revision=23.5.A.1.291
-ro.semc.version.sw_variant=GLOBAL-LTECA
-ro.semc.version.sw_type=user
-ro.semc.version.fs_revision=23.5.A.1.291
-ro.semc.version.fs=GENERIC
-ro.semc.version.cust.active=
-
-# aDSP sensors
-## max rate
-ro.qti.sensors.max_accel_rate=false
-ro.qti.sensors.max_gyro_rate=false
-ro.qti.sensors.max_mag_rate=false
-ro.qti.sensors.max_geomag_rotv=50
-## sensor type
-ro.qti.sdk.sensors.gestures=false
-ro.qti.sensors.pedometer=false
-ro.qti.sensors.step_detector=true
-ro.qti.sensors.step_counter=true
-ro.qti.sensors.pam=false
-ro.qti.sensors.scrn_ortn=false
-ro.qti.sensors.smd=true
-ro.qti.sensors.game_rv=true
-ro.qti.sensors.georv=true
-ro.qti.sensors.cmc=false
-ro.qti.sensors.bte=false
-ro.qti.sensors.fns=false
-ro.qti.sensors.qmd=false
-ro.qti.sensors.amd=false
-ro.qti.sensors.rmd=false
-ro.qti.sensors.vmd=false
-ro.qti.sensors.gtap=false
-ro.qti.sensors.tap=false
-ro.qti.sensors.facing=false
-ro.qti.sensors.tilt=false
-ro.qti.sensors.tilt_detector=true
-ro.qti.sensors.dpc=false
-ro.qti.sensors.wu=false
-
-# BT rfkill
-ro.rfkilldisabled=1
-
-# Assertive Display
-ro.qcom.ad=1
-ro.qcom.ad.calib.data=/system/etc/ad_calib.cfg
-
-# Audio config
-ro.qc.sdk.audio.fluencetype=fluence
-persist.audio.fluence.voicecall=true
-persist.audio.fluence.voicerec=false
-persist.audio.fluence.audiorec=true
-persist.audio.fluence.speaker=false
-persist.audio.handset.mic.type=analog
-persist.audio.anc.enabled=true
diff --git a/system_prop.mk b/system_prop.mk
new file mode 100644
index 0000000..7ad5dc1
--- /dev/null
+++ b/system_prop.mk
@@ -0,0 +1,60 @@
+# aDSP sensors
+## max rate
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sensors.max_accel_rate=false \
+    ro.qti.sensors.max_gyro_rate=false \
+    ro.qti.sensors.max_mag_rate=false \
+    ro.qti.sensors.max_geomag_rotv=50
+
+## sensor type
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sdk.sensors.gestures=false \
+    ro.qti.sensors.pedometer=false \
+    ro.qti.sensors.step_detector=true \
+    ro.qti.sensors.step_counter=true \
+    ro.qti.sensors.pam=false \
+    ro.qti.sensors.scrn_ortn=false \
+    ro.qti.sensors.smd=true \
+    ro.qti.sensors.game_rv=true \
+    ro.qti.sensors.georv=true \
+    ro.qti.sensors.cmc=false \
+    ro.qti.sensors.bte=false \
+    ro.qti.sensors.fns=false \
+    ro.qti.sensors.qmd=false \
+    ro.qti.sensors.amd=false \
+    ro.qti.sensors.rmd=false \
+    ro.qti.sensors.vmd=false \
+    ro.qti.sensors.gtap=false \
+    ro.qti.sensors.tap=false \
+    ro.qti.sensors.facing=false \
+    ro.qti.sensors.tilt=false \
+    ro.qti.sensors.tilt_detector=true \
+    ro.qti.sensors.dpc=false \
+    ro.qti.sensors.wu=false
+
+# Assertive Display
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qcom.ad=1 \
+    ro.qcom.ad.calib.data=/system/etc/ad_calib.cfg
+
+# Audio config
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qc.sdk.audio.fluencetype=fluence \
+    persist.audio.fluence.voicecall=true \
+    persist.audio.fluence.voicerec=false \
+    persist.audio.fluence.audiorec=true \
+    persist.audio.fluence.speaker=false \
+    persist.audio.handset.mic.type=analog \
+    persist.audio.anc.enabled=true
+
+# Bluetooth rfkill
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.rfkilldisabled=1
+
+# Semc
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.semc.version.sw_revision=23.5.A.1.291 \
+    ro.semc.version.sw_variant=GLOBAL-LTECA \
+    ro.semc.version.sw_type=user \
+    ro.semc.version.fs_revision=23.5.A.1.291 \
+    ro.semc.version.fs=GENERIC