Merge "darwin: move vendor properties to vendor/build.prop [1/1]" into p-amlogic

3 files changed, 156 insertions, 105 deletions

diff --git a/darwin.mk b/darwin.mk
index 4c8a393..087c084 100644..100755
--- a/darwin.mk
+++ b/darwin.mk
@@ -32,6 +32,7 @@ endif
 
 $(call inherit-product, device/amlogic/common/products/tv/product_tv.mk)
 $(call inherit-product, device/amlogic/darwin/device.mk)
+$(call inherit-product, device/amlogic/darwin/vendor_prop.mk)
 $(call inherit-product-if-exists, vendor/google/products/gms.mk)
 
 # darwin:
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 363bfd7..0000000
--- a/system.prop
+++ b/dev/null
@@ -1,105 +0,0 @@
-# Set display related config
-ro.platform.has.mbxuimode=true
-ro.platform.has.realoutputmode=true
-ro.platform.keepbackground.app=com.droidlogic.PPPoE
-ro.platform.customize_tvsetting=true
-#camera max to 720p
-ro.camera.preview.MaxSize=1280x720
-ro.camera.preview.LimitedRate=1280x720x30,640x480x30,320x240x28
-ro.camera.preview.UseMJPEG=1
-
-#if TV SOC as mbox
-ro.tvsoc.as.mbox=true
-
-#if wifi Only
-ro.radio.noril=false
-
-ro.config.media_vol_steps=100
-
-#if need pppoe
-ro.net.pppoe=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
-
-#this property is used for Android TV audio
-ro.platform.is.tv=1
-
-#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
-
-#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
-
-#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
-
-#use sdcardfs
-ro.sys.sdcardfs=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
-
-
-#Hdmi In
-ro.sys.hdmiin.enable=true
-mbx.hdmiin.switchfull=false
-mbx.hdmiin.videolayer=false
-
-#adb
-service.adb.tcp.port=5555
-
-#for Tv
-ro.platform.has.tvuimode=true
-
-# crypto volume
-ro.crypto.volume.filenames_mode=aes-256-cts
diff --git a/vendor_prop.mk b/vendor_prop.mk
new file mode 100644
index 0000000..3e156eb
--- a/dev/null
+++ b/vendor_prop.mk
@@ -0,0 +1,155 @@
+# 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.tvuimode=true \
+    ro.platform.has.mbxuimode=true \
+    ro.platform.has.realoutputmode=true \
+    ro.platform.customize_tvsetting=true
+
+#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 TV SOC as mbox
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.tvsoc.as.mbox=true
+
+#this property is used for Android TV audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.platform.is.tv=1
+
+#if wifi Only
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.radio.noril=false
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.media_vol_steps=100
+
+#if need pppoe
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.net.pppoe=true
+
+PRODUCT_PROPERTY_OVERRIDES += \
+   ro.platform.support.dolbyvision=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
+#PRODUCT_PROPERTY_OVERRIDES += \
+    #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
+
+
+#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
+
+#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
+PRODUCT_PROPERTY_OVERRIDES += \
+    #ro.vold.primary_physical=true
+
+#Support storage visible to apps
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.fw.force_adoptable=true
+
+#use sdcardfs
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.sys.sdcardfs=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
+
+#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
+
+# crypto volume
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.crypto.volume.filenames_mode=aes-256-cts