curie:move vendor properties to vendor/build.prop[1/1]

PD# 171745

delete system.prop, if property is in system.prop,
will be built to system/build.prop. When GSI flashed,
it will lose efficacy

Change-Id: I7f2f8d189998ebc1e52d88127a899bedd21d1f9c

3 files changed, 229 insertions, 185 deletions

diff --git a/curie.mk b/curie.mk
index aa94e83..4d18c93 100644
--- a/curie.mk
+++ b/curie.mk
@@ -35,7 +35,7 @@ endif
 $(call inherit-product, device/amlogic/common/products/mbox/product_mbox.mk)
 $(call inherit-product, device/amlogic/curie/device.mk)
 $(call inherit-product-if-exists, vendor/google/products/gms.mk)
-
+$(call inherit-product, device/amlogic/curie/vendor_prop.mk)
 TARGET_WITH_MEDIA_EXT_LEVEL := 3
 
 #########################################################################
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 7d31ae0..0000000
--- a/system.prop
+++ b/dev/null
@@ -1,184 +0,0 @@
-# Set display related config
-ro.platform.has.mbxuimode=true
-ro.platform.has.realoutputmode=true
-ro.platform.support.4k=false
-ro.platform.keepbackground.app=com.droidlogic.PPPoE
-#camera max to 720p
-ro.camera.preview.MaxSize=1280x720
-ro.camera.preview.LimitedRate=1280x720x30,640x480x30,320x240x28
-ro.camera.preview.UseMJPEG=1
-
-#if wifi Only
-ro.radio.noril=false
-
-#if need pppoe
-ro.net.pppoe=true
-
-# Low memory platform
-ro.config.low_ram=true
-
-#the prop is used for enable or disable
-#DD+/DD force output when HDMI EDID is not supported
-#by default,the force output mode is enabled.
-#Note,please do not set the prop to true by default
-#only for netflix,just disable the feature.so set the prop to true
-ro.platform.disable.audiorawout=false
-
-#Dolby DD+ decoder option
-#this prop to for videoplayer display the DD+/DD icon when playback
-ro.platform.support.dolby=true
-#DTS decoder option
-#display dts icon when playback
-ro.platform.support.dts=true
-#DTS-HD support prop
-#ro.platform.support.dtstrans=true
-#ro.platform.support.dtsmulasset=true
-#DTS-HD prop end
-# Enable player buildin
-media.amplayer.seekkeyframe=true
-media.amsuperplayer.enable=true
-media.amplayer.enable-acodecs=ac3,eac3,rm,dts
-media.amplayer.enable=true
-media.amsuperplayer.m4aplayer=STAGEFRIGHT_PLAYER
-media.amsuperplayer.defplayer=PV_PLAYER
-media.amplayer.thumbnail=true
-media.amplayer.dsource4local=1
-media.amplayer.dropwaitxms=100
-
-media.arm.audio.decoder=ape,flac,dts,ac3,eac3,wma,wmapro,mp3,aac,vorbis,raac,cook,amr,pcm,adpcm,aac_latm,rm
-media.wfd.use-pcm-audio=false
-media.wfd.videoresolution-type=1
-media.wfd.videoresolution-group=0
-media.wfd.videoframerate=24
-media.wfd.video-bitrate=2000000
-media.html5videowin.enable=1
-media.decoder.vfm.defmap=decoder ppmgr deinterlace amvideo
-media.decoder.vfm.drmmap=decoder amvideo
-
-persist.sys.dts.edid=false
-
-
-#add for video boot, 1 means use video boot, others not .
-service.bootvideo=0
-
-# Define drm for this device
-drm.service.enabled=1
-
-#used forward seek for libplayer
-media.libplayer.seek.fwdsearch=1
-
-#set memory upper limit for extractor process
-ro.media.maxmem=419430400
-
-#fix hls sync
-libplayer.livets.softdemux=1
-libplayer.netts.recalcpts=1
-
-#map volume
-ro.audio.mapvalue=0,0,0,0
-
-#By default, primary storage is physical
-#ro.vold.primary_physical=true
-
-#Support storage visible to apps
-persist.fw.force_adoptable=true
-
-#add livhls,libcurl as default hls
-media.libplayer.curlenable=true
-media.libplayer.modules=vhls_mod,dash_mod,curl_mod,prhls_mod,vm_mod,bluray_mod
-
-#Do note send inactive cmd when disable cec service
-sys.ignore.inativecec=true
-
-#Hdmi In
-ro.sys.hdmiin.enable=true
-mbx.hdmiin.switchfull=false
-mbx.hdmiin.videolayer=false
-
-#adb
-service.adb.tcp.port=5555
-
-
-sys.open.deepcolor=true
-
-######## UBOOTENV VARIBLES - r/w as system properties ##########
-#
-#  Now we can load ubootenv varibles to system properties.
-#  We use a special prefix ("ubootenv.var" as default) to indicate that the 'property'
-#  actually is an ubootenv varible.
-#
-#  A ubootenv 'property' will be initialized during system booting. And when user set
-#  a different value, it will be written back to ubootenv device immediately.
-#
-
-## prefix of ubootenv varibles - should less than 16 chars.
-#UBOOTENV MTD NAME
-#ubootenv.var.bootcmd=
-#ubootenv.var.cpuclock=
-#ubootenv.var.gpuclock=
-#ubootenv.var.memsize=
-#ubootenv.var.ethaddr=
-#ubootenv.var.ipaddr=
-#ubootenv.var.gatewayip=
-ubootenv.var.outputmode=
-#ubootenv.var.screenratio=
-#ubootenv.var.oobeflag=
-ubootenv.var.480p_x=
-ubootenv.var.480p_y=
-ubootenv.var.480p_w=
-ubootenv.var.480p_h=
-ubootenv.var.480i_x=
-ubootenv.var.480i_y=
-ubootenv.var.480i_w=
-ubootenv.var.480i_h=
-ubootenv.var.576p_x=
-ubootenv.var.576p_y=
-ubootenv.var.576p_w=
-ubootenv.var.576p_h=
-ubootenv.var.576i_x=
-ubootenv.var.576i_y=
-ubootenv.var.576i_w=
-ubootenv.var.576i_h=
-ubootenv.var.720p_x=
-ubootenv.var.720p_y=
-ubootenv.var.720p_w=
-ubootenv.var.720p_h=
-ubootenv.var.1080p_x=
-ubootenv.var.1080p_y=
-ubootenv.var.1080p_w=
-ubootenv.var.1080p_h=
-ubootenv.var.1080i_x=
-ubootenv.var.1080i_y=
-ubootenv.var.1080i_w=
-ubootenv.var.1080i_h=
-ubootenv.var.4k2k24hz_x=
-ubootenv.var.4k2k24hz_y=
-ubootenv.var.4k2k24hz_w=
-ubootenv.var.4k2k24hz_h=
-ubootenv.var.4k2k25hz_x=
-ubootenv.var.4k2k25hz_y=
-ubootenv.var.4k2k25hz_w=
-ubootenv.var.4k2k25hz_h=
-ubootenv.var.4k2k30hz_x=
-ubootenv.var.4k2k30hz_y=
-ubootenv.var.4k2k30hz_w=
-ubootenv.var.4k2k30hz_h=
-ubootenv.var.4k2ksmpte_x=
-ubootenv.var.4k2ksmpte_y=
-ubootenv.var.4k2ksmpte_w=
-ubootenv.var.4k2ksmpte_h=
-ubootenv.var.digitaudiooutput=
-ubootenv.var.defaulttvfrequency=
-ubootenv.var.has.accelerometer=
-ubootenv.var.cecconfig=
-ubootenv.var.cvbsmode=
-ubootenv.var.hdmimode=
-ubootenv.var.is.bestmode=
-ubootenv.var.disp.fromleft=
-ubootenv.var.edid.crcvalue=
-ubootenv.var.colorattribute=
-
-#720P UI,  1280 * 720 *4 * 5 = 18M, 5 frame is enough
-ro.hwui.texture_cache_size=18.0f
-ro.hwui.layer_cache_size=15.0f
-
diff --git a/vendor_prop.mk b/vendor_prop.mk
new file mode 100644
index 0000000..483cabc
--- a/dev/null
+++ b/vendor_prop.mk
@@ -0,0 +1,228 @@
+# Copyright (C) 2011 Amlogic Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# This file is the build configuration for a full Android
+# build for Meson reference board.
+#
+
+# Set display related config
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.platform.has.mbxuimode=true \
+    ro.platform.has.realoutputmode=true \
+    ro.platform.support.4k=false \
+
+#camera max to 720p
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    #ro.camera.preview.MaxSize=1280x720 \
+    #ro.camera.preview.LimitedRate=1280x720x30,640x480x30,320x240x28
+
+#camera max to 1080p
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.camera.preview.MaxSize=1920x1080 \
+    ro.camera.preview.LimitedRate=1920x1080x30,1280x720x30,640x480x30,320x240x28 \
+    ro.camera.preview.UseMJPEG=1
+
+#if wifi Only
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.radio.noril=false \
+
+#if need pppoe
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.net.pppoe=true
+
+# Low memory platform
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.config.low_ram=true
+
+#the prop is used for enable or disable
+#DD+/DD force output when HDMI EDID is not supported
+#by default,the force output mode is enabled.
+#Note,please do not set the prop to true by default
+#only for netflix,just disable the feature.so set the prop to true
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.platform.disable.audiorawout=false
+
+#Dolby DD+ decoder option
+#this prop to for videoplayer display the DD+/DD icon when playback
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.platform.support.dolby=true
+
+#DTS decoder option
+#display dts icon when playback
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.platform.support.dts=true
+
+#DTS-HD support prop
+#ro.platform.support.dtstrans=true
+#ro.platform.support.dtsmulasset=true
+#DTS-HD prop end
+# Enable player buildin
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    media.amplayer.seekkeyframe=true \
+    media.amsuperplayer.enable=true \
+    media.amplayer.enable-acodecs=ac3,eac3,rm,dts \
+    media.amplayer.enable=true \
+    media.amsuperplayer.m4aplayer=STAGEFRIGHT_PLAYER \
+    media.amsuperplayer.defplayer=PV_PLAYER \
+    media.amplayer.thumbnail=true \
+    media.amplayer.dsource4local=1 \
+    media.amplayer.dropwaitxms=100 \
+    media.arm.audio.decoder=ape,flac,dts,ac3,eac3,wma,wmapro,mp3,aac,vorbis,raac,cook,amr,pcm,adpcm,aac_latm,rm \
+    media.wfd.use-pcm-audio=false \
+    media.wfd.videoresolution-type=1 \
+    media.wfd.videoresolution-group=0 \
+    media.wfd.videoframerate=24 \
+    media.wfd.video-bitrate=2000000 \
+    media.html5videowin.enable=1 \
+    media.decoder.vfm.defmap=decoder ppmgr deinterlace amvideo \
+    media.decoder.vfm.drmmap=decoder amvideo \
+    persist.sys.dts.edid=false
+
+#add for video boot, 1 means use video boot, others not .
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    service.bootvideo=0
+
+# Define drm for this device
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    drm.service.enabled=1
+
+#used forward seek for libplayer
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    media.libplayer.seek.fwdsearch=1
+
+#set memory upper limit for extractor process
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.media.maxmem=419430400
+
+#fix hls sync
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    libplayer.livets.softdemux=1 \
+    libplayer.netts.recalcpts=1
+
+#map volume
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.audio.mapvalue=0,0,0,0
+
+#By default, primary storage is physical
+#ro.vold.primary_physical=true
+
+#Support storage visible to apps
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    persist.fw.force_adoptable=true
+
+#add livhls,libcurl as default hls
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    media.libplayer.curlenable=true \
+    media.libplayer.modules=vhls_mod,dash_mod,curl_mod,prhls_mod,vm_mod,bluray_mod
+
+#Do note send inactive cmd when disable cec service
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    sys.ignore.inativecec=true
+
+#Hdmi In
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.sys.hdmiin.enable=true \
+    mbx.hdmiin.switchfull=false \
+    mbx.hdmiin.videolayer=false
+
+#adb
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    service.adb.tcp.port=5555
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    sys.open.deepcolor=true
+
+######## UBOOTENV VARIBLES - r/w as system properties ##########
+#
+#  Now we can load ubootenv varibles to system properties.
+#  We use a special prefix ("ubootenv.var" as default) to indicate that the 'property'
+#  actually is an ubootenv varible.
+#
+#  A ubootenv 'property' will be initialized during system booting. And when user set
+#  a different value, it will be written back to ubootenv device immediately.
+#
+## prefix of ubootenv varibles - should less than 16 chars.
+#UBOOTENV MTD NAME
+#ubootenv.var.bootcmd=
+#ubootenv.var.cpuclock=
+#ubootenv.var.gpuclock=
+#ubootenv.var.memsize=
+#ubootenv.var.ethaddr=
+#ubootenv.var.ipaddr=
+#ubootenv.var.gatewayip=
+PRODUCT_PROPERTY_OVERRIDES += \
+    ubootenv.var.outputmode=
+#ubootenv.var.screenratio=
+#ubootenv.var.oobeflag=
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ubootenv.var.480p_x= \
+    ubootenv.var.480p_y= \
+    ubootenv.var.480p_w= \
+    ubootenv.var.480p_h= \
+    ubootenv.var.480i_x= \
+    ubootenv.var.480i_y= \
+    ubootenv.var.480i_w= \
+    ubootenv.var.480i_h= \
+    ubootenv.var.576p_x= \
+    ubootenv.var.576p_y= \
+    ubootenv.var.576p_w= \
+    ubootenv.var.576p_h= \
+    ubootenv.var.576i_x= \
+    ubootenv.var.576i_y= \
+    ubootenv.var.576i_w= \
+    ubootenv.var.576i_h= \
+    ubootenv.var.720p_x= \
+    ubootenv.var.720p_y= \
+    ubootenv.var.720p_w= \
+    ubootenv.var.720p_h= \
+    ubootenv.var.1080p_x= \
+    ubootenv.var.1080p_y= \
+    ubootenv.var.1080p_w= \
+    ubootenv.var.1080p_h= \
+    ubootenv.var.1080i_x= \
+    ubootenv.var.1080i_y= \
+    ubootenv.var.1080i_w= \
+    ubootenv.var.1080i_h= \
+    ubootenv.var.4k2k24hz_x= \
+    ubootenv.var.4k2k24hz_y= \
+    ubootenv.var.4k2k24hz_w= \
+    ubootenv.var.4k2k24hz_h= \
+    ubootenv.var.4k2k25hz_x= \
+    ubootenv.var.4k2k25hz_y= \
+    ubootenv.var.4k2k25hz_w= \
+    ubootenv.var.4k2k25hz_h= \
+    ubootenv.var.4k2k30hz_x= \
+    ubootenv.var.4k2k30hz_y= \
+    ubootenv.var.4k2k30hz_w= \
+    ubootenv.var.4k2k30hz_h= \
+    ubootenv.var.4k2ksmpte_x= \
+    ubootenv.var.4k2ksmpte_y= \
+    ubootenv.var.4k2ksmpte_w= \
+    ubootenv.var.4k2ksmpte_h= \
+    ubootenv.var.digitaudiooutput= \
+    ubootenv.var.defaulttvfrequency= \
+    ubootenv.var.has.accelerometer= \
+    ubootenv.var.cecconfig= \
+    ubootenv.var.cvbsmode= \
+    ubootenv.var.hdmimode= \
+    ubootenv.var.is.bestmode= \
+    ubootenv.var.disp.fromleft= \
+    ubootenv.var.edid.crcvalue= \
+    ubootenv.var.colorattribute=
+
+#720P UI,  1280 * 720 *4 * 5 = 18M, 5 frame is enough
+PRODUCT_PROPERTY_OVERRIDES +=  \
+    ro.hwui.texture_cache_size=18.0f \
+    ro.hwui.layer_cache_size=15.0f