wayne-common: Inherit properties from makefile

Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>

BoardConfigCommon.mk

@@ -221,7 +221,6 @@ TARGET_USES_INTERACTION_BOOST := true
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-TARGET_VENDOR_PROP := $(COMMON_PATH)/vendor.prop
 
 # Recovery
 ifeq ($(AB_OTA_UPDATER), true)

properties.mk

@@ -0,0 +1,148 @@
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    af.fast_track_multiplier=1 \
+    audio.adm.buffering.ms=6 \
+    audio.deep_buffer.media=true \
+    audio.offload.min.duration.secs=30 \
+    audio.offload.video=true \
+    persist.dirac.acs.controller=qem \
+    persist.dirac.acs.ignore_error=1 \
+    persist.dirac.acs.storeSettings=1 \
+    persist.vendor.audio.fluence.speaker=true \
+    persist.vendor.audio.fluence.voicecall=true \
+    persist.vendor.audio.fluence.voicerec=false \
+    persist.vendor.audio.hifi.int_codec=true \
+    persist.vendor.audio.ras.enabled=false \
+    persist.vendor.bt.a2dp_offload_cap=sbc-aac \
+    ro.audio.soundfx.dirac=true \
+    ro.vendor.audio.sdk.fluencetype=fluence \
+    ro.vendor.audio.sdk.ssr=false \
+    vendor.audio.dolby.ds2.enabled=false \
+    vendor.audio.dolby.ds2.hardbypass=false \
+    vendor.audio.flac.sw.decoder.24bit=true \
+    vendor.audio.hw.aac.encoder=true \
+    vendor.audio.noisy.broadcast.delay=600 \
+    vendor.audio.offload.buffer.size.kb=64 \
+    vendor.audio.offload.gapless.enabled=true \
+    vendor.audio.offload.multiaac.enable=true \
+    vendor.audio.offload.multiple.enabled=false \
+    vendor.audio.offload.passthrough=false \
+    vendor.audio.offload.pstimeout.secs=3 \
+    vendor.audio.offload.track.enable=false \
+    vendor.audio.parser.ip.buffer.size=262144 \
+    vendor.audio.safx.pbe.enabled=true \
+    vendor.audio.tunnel.encode=false \
+    vendor.audio.use.sw.alac.decoder=true \
+    vendor.audio.use.sw.ape.decoder=true \
+    vendor.audio_hal.period_size=192 \
+    vendor.fm.a2dp.conc.disabled=true \
+    vendor.voice.path.for.pcm.voip=true
+
+# Bluetooth
+PRODUCT_PROPERTY_OVERRIDES += \
+    qcom.bluetooth.soc=cherokee
+
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.bokeh.switch.lux=290 \
+    persist.camera.depth.focus.cb=0 \
+    persist.camera.expose.aux=1 \
+    persist.camera.isp.clock.optmz=0 \
+    persist.camera.isp.turbo=1 \
+    persist.camera.linkpreview=0 \
+    persist.camera.preview.ubwc=0 \
+    persist.camera.set.afd=4 \
+    persist.camera.stats.test=0 \
+    persist.imx376_ofilm.light.lux=280 \
+    persist.imx376_ofilm.low.lux=310 \
+    persist.imx376_sunny.light.lux=280 \
+    persist.imx376_sunny.low.lux=310 \
+    vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \
+    video.disable.ubwc=1
+
+# Display
+PRODUCT_PROPERTY_OVERRIDES += \
+    debug.gralloc.enable_fb_ubwc=1 \
+    debug.sf.enable_hwc_vds=1 \
+    debug.sf.hw=1 \
+    debug.sf.latch_unsignaled=1 \
+    persist.debug.wfd.enable=1 \
+    persist.hwc.enable_vds=1 \
+    ro.opengles.version=196610 \
+    ro.qualcomm.cabl=0 \
+    ro.sf.lcd_density=440 \
+    sdm.debug.disable_skip_validate=1
+
+# GPS
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.overlay.izat.optin=rro
+
+# Media
+PRODUCT_PROPERTY_OVERRIDES += \
+    media.aac_51_output_enabled=true \
+    media.stagefright.enable-aac=true \
+    media.stagefright.enable-http=true \
+    media.stagefright.enable-player=true \
+    media.stagefright.enable-qcp=true \
+    media.stagefright.enable-scan=true \
+    mm.enable.qcom_parser=13631471 \
+    mm.enable.smoothstreaming=true \
+    mmp.enable.3g2=true \
+    persist.mm.enable.prefetch=true \
+    vendor.vidc.dec.enable.downscalar=1 \
+    vendor.vidc.enc.disable.pq=false \
+    vendor.vidc.enc.disable_bframes=1 \
+    vidc.enc.dcvs.extra-buff-count=2 \
+    vidc.enc.target_support_bframe=1
+
+# QCOM
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.cne.feature=1 \
+    persist.dpm.feature=1 \
+    persist.timed.enable=true \
+    persist.vendor.qcomsysd.enabled=1 \
+    ro.vendor.at_library=libqti-at.so \
+    ro.vendor.extension_library=libqti-perfd-client.so
+
+# Radio
+PRODUCT_PROPERTY_OVERRIDES += \
+    DEVICE_PROVISIONED=1 \
+    persist.data.df.agg.dl_pkt=10 \
+    persist.data.df.agg.dl_size=4096 \
+    persist.data.df.dev_name=rmnet_usb0 \
+    persist.data.df.dl_mode=5 \
+    persist.data.df.iwlan_mux=9 \
+    persist.data.df.mux_count=8 \
+    persist.data.df.ul_mode=5 \
+    persist.data.mode=concurrent \
+    persist.data.netmgrd.qos.enable=true \
+    persist.data.wda.enable=true \
+    persist.radio.VT_CAM_INTERFACE=2 \
+    persist.radio.apm_sim_not_pwdn=1 \
+    persist.radio.atfwd.start=true \
+    persist.radio.multisim.config=dsds \
+    persist.radio.schd.cache=3500 \
+    persist.rmnet.data.enable=true \
+    persist.vendor.qti.telephony.vt_cam_interface=1 \
+    persist.vendor.radio.custom_ecc=1 \
+    persist.vendor.radio.rat_on=combine \
+    persist.vendor.radio.sib16_support=1 \
+    ril.subscription.types=NV,RUIM \
+    rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \
+    ro.telephony.default_network=22,20 \
+    ro.use_data_netmgrd=true \
+    telephony.lteOnCdmaDevice=1
+
+# Sensor
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.sdk.sensors.gestures=false \
+    ro.vendor.sensors.cmc=false \
+    ro.vendor.sensors.dev_ori=false \
+    ro.vendor.sensors.facing=false \
+    ro.vendor.sensors.mot_detect=true \
+    ro.vendor.sensors.pmd=true \
+    ro.vendor.sensors.sta_detect=true
+
+# Subsystem Restart
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.sys.ssr.restart_level=ALL_ENABLE

vendor.prop

@@ -1,138 +0,0 @@
-# Audio
-af.fast_track_multiplier=1
-audio.adm.buffering.ms=6
-audio.deep_buffer.media=true
-audio.offload.min.duration.secs=30
-audio.offload.video=true
-persist.dirac.acs.controller=qem
-persist.dirac.acs.ignore_error=1
-persist.dirac.acs.storeSettings=1
-persist.vendor.audio.fluence.speaker=true
-persist.vendor.audio.fluence.voicecall=true
-persist.vendor.audio.fluence.voicerec=false
-persist.vendor.audio.hifi.int_codec=true
-persist.vendor.audio.ras.enabled=false
-persist.vendor.bt.a2dp_offload_cap=sbc-aac
-ro.audio.soundfx.dirac=true
-ro.vendor.audio.sdk.fluencetype=fluence
-ro.vendor.audio.sdk.ssr=false
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
-vendor.audio.flac.sw.decoder.24bit=true
-vendor.audio.hw.aac.encoder=true
-vendor.audio.noisy.broadcast.delay=600
-vendor.audio.offload.buffer.size.kb=64
-vendor.audio.offload.gapless.enabled=true
-vendor.audio.offload.multiaac.enable=true
-vendor.audio.offload.multiple.enabled=false
-vendor.audio.offload.passthrough=false
-vendor.audio.offload.pstimeout.secs=3
-vendor.audio.offload.track.enable=false
-vendor.audio.parser.ip.buffer.size=262144
-vendor.audio.safx.pbe.enabled=true
-vendor.audio.tunnel.encode=false
-vendor.audio.use.sw.alac.decoder=true
-vendor.audio.use.sw.ape.decoder=true
-vendor.audio_hal.period_size=192
-vendor.fm.a2dp.conc.disabled=true
-vendor.voice.path.for.pcm.voip=true
-
-# Bluetooth
-qcom.bluetooth.soc=cherokee
-
-# Camera
-persist.bokeh.switch.lux=290
-persist.camera.depth.focus.cb=0
-persist.camera.expose.aux=1
-persist.camera.isp.clock.optmz=0
-persist.camera.isp.turbo=1
-persist.camera.linkpreview=0
-persist.camera.preview.ubwc=0
-persist.camera.set.afd=4
-persist.camera.stats.test=0
-persist.imx376_ofilm.light.lux=280
-persist.imx376_ofilm.low.lux=310
-persist.imx376_sunny.light.lux=280
-persist.imx376_sunny.low.lux=310
-vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi
-video.disable.ubwc=1
-
-# Display
-debug.gralloc.enable_fb_ubwc=1
-debug.sf.enable_hwc_vds=1
-debug.sf.hw=1
-debug.sf.latch_unsignaled=1
-persist.debug.wfd.enable=1
-persist.hwc.enable_vds=1
-ro.opengles.version=196610
-ro.qualcomm.cabl=0
-ro.sf.lcd_density=440
-sdm.debug.disable_skip_validate=1
-
-# GPS
-persist.vendor.overlay.izat.optin=rro
-
-# Media
-media.aac_51_output_enabled=true
-media.stagefright.enable-aac=true
-media.stagefright.enable-http=true
-media.stagefright.enable-player=true
-media.stagefright.enable-qcp=true
-media.stagefright.enable-scan=true
-mm.enable.qcom_parser=13631471
-mm.enable.smoothstreaming=true
-mmp.enable.3g2=true
-persist.mm.enable.prefetch=true
-vendor.vidc.dec.enable.downscalar=1
-vendor.vidc.enc.disable.pq=false
-vendor.vidc.enc.disable_bframes=1
-vidc.enc.dcvs.extra-buff-count=2
-vidc.enc.target_support_bframe=1
-
-# QCOM
-persist.cne.feature=1
-persist.dpm.feature=1
-persist.timed.enable=true
-persist.vendor.qcomsysd.enabled=1
-ro.vendor.at_library=libqti-at.so
-ro.vendor.extension_library=libqti-perfd-client.so
-
-# Radio
-DEVICE_PROVISIONED=1
-persist.data.df.agg.dl_pkt=10
-persist.data.df.agg.dl_size=4096
-persist.data.df.dev_name=rmnet_usb0
-persist.data.df.dl_mode=5
-persist.data.df.iwlan_mux=9
-persist.data.df.mux_count=8
-persist.data.df.ul_mode=5
-persist.data.mode=concurrent
-persist.data.netmgrd.qos.enable=true
-persist.data.wda.enable=true
-persist.radio.VT_CAM_INTERFACE=2
-persist.radio.atfwd.start=true
-persist.radio.multisim.config=dsds
-persist.rmnet.data.enable=true
-persist.vendor.qti.telephony.vt_cam_interface=1
-ril.subscription.types=NV,RUIM
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
-ro.telephony.default_network=22,20
-ro.use_data_netmgrd=true
-telephony.lteOnCdmaDevice=1
-
-# Sensor
-persist.radio.apm_sim_not_pwdn=1
-persist.radio.schd.cache=3500
-persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.rat_on=combine
-persist.vendor.radio.sib16_support=1
-ro.vendor.sdk.sensors.gestures=false
-ro.vendor.sensors.cmc=false
-ro.vendor.sensors.dev_ori=false
-ro.vendor.sensors.facing=false
-ro.vendor.sensors.mot_detect=true
-ro.vendor.sensors.pmd=true
-ro.vendor.sensors.sta_detect=true
-
-# Subsystem Restart
-persist.sys.ssr.restart_level=ALL_ENABLE

wayne.mk

@@ -26,6 +26,9 @@ $(call inherit-product, vendor/xiaomi/wayne-common/wayne-common-vendor.mk)
 
 COMMON_PATH := device/xiaomi/wayne-common
 
+# Inherit properties
+$(call inherit-product, $(COMMON_PATH)/properties.mk)
+
 # Screen density
 PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi