From 86cd7f23847c82cb25d503eafeb25c77c3bcba79 Mon Sep 17 00:00:00 2001 From: Xindong Xu Date: Tue, 19 Dec 2017 07:42:09 +0000 Subject: ref_dev_common: bring up darwin [1/3] PD# 157184 bring up darwin Change-Id: Id1ad3c685faf443bedecc380c299ead2c5cb4e81 --- diff --git a/factory.mk b/factory.mk index 9115092..b9b09d9 100644 --- a/factory.mk +++ b/factory.mk @@ -309,7 +309,7 @@ ifeq ($(TARGET_PRODUCT),curie) echo "board=p241" > $(PRODUCT_OUT)/fastboot/android-info.txt endif ifeq ($(TARGET_PRODUCT),darwin) - echo "board=txlx_t962e_r321" > $(PRODUCT_OUT)/fastboot/android-info.txt + echo "board=txlx_skt" > $(PRODUCT_OUT)/fastboot/android-info.txt endif cd $(PRODUCT_OUT)/fastboot; zip -r ../$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES) diff --git a/gps/gps.conf_AS b/gps/gps.conf_AS deleted file mode 100644 index 510f656..0000000 --- a/gps/gps.conf_AS +++ b/dev/null @@ -1,4 +0,0 @@ -NTP_SERVER=asia.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin diff --git a/gps/gps.conf_AS_SUPL b/gps/gps.conf_AS_SUPL deleted file mode 100644 index 51154b9..0000000 --- a/gps/gps.conf_AS_SUPL +++ b/dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=asia.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/gps/gps.conf_EU b/gps/gps.conf_EU deleted file mode 100644 index 49dffbe..0000000 --- a/gps/gps.conf_EU +++ b/dev/null @@ -1,4 +0,0 @@ -NTP_SERVER=europe.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin diff --git a/gps/gps.conf_EU_SUPL b/gps/gps.conf_EU_SUPL deleted file mode 100644 index 926f884..0000000 --- a/gps/gps.conf_EU_SUPL +++ b/dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=europe.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/gps/gps.conf_US b/gps/gps.conf_US deleted file mode 100644 index 5abbd5c..0000000 --- a/gps/gps.conf_US +++ b/dev/null @@ -1,4 +0,0 @@ -NTP_SERVER=north-america.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin diff --git a/gps/gps.conf_US_SUPL b/gps/gps.conf_US_SUPL deleted file mode 100644 index b766326..0000000 --- a/gps/gps.conf_US_SUPL +++ b/dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=north-america.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/gps/gps_as.mk b/gps/gps_as.mk deleted file mode 100644 index 2319a63..0000000 --- a/gps/gps_as.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_AS:system/etc/gps.conf diff --git a/gps/gps_as_supl.mk b/gps/gps_as_supl.mk deleted file mode 100644 index 95470e9..0000000 --- a/gps/gps_as_supl.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_AS_SUPL:system/etc/gps.conf diff --git a/gps/gps_eu.mk b/gps/gps_eu.mk deleted file mode 100644 index e2cabac..0000000 --- a/gps/gps_eu.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_EU:system/etc/gps.conf diff --git a/gps/gps_eu_supl.mk b/gps/gps_eu_supl.mk deleted file mode 100644 index e9a6f5d..0000000 --- a/gps/gps_eu_supl.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_EU_SUPL:system/etc/gps.conf diff --git a/gps/gps_us.mk b/gps/gps_us.mk deleted file mode 100644 index e4eb2ab..0000000 --- a/gps/gps_us.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_US:system/etc/gps.conf diff --git a/gps/gps_us_supl.mk b/gps/gps_us_supl.mk deleted file mode 100644 index 3416f1d..0000000 --- a/gps/gps_us_supl.mk +++ b/dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -PRODUCT_COPY_FILES := \ - device/common/gps/gps.conf_US_SUPL:system/etc/gps.conf diff --git a/media.mk b/media.mk index c02ffe2..e940cf9 100644 --- a/media.mk +++ b/media.mk @@ -25,8 +25,7 @@ #TARGET_WITH_AMLOGIC_SCREAN_MEDIASOURCE :=true #TARGET_WITH_AMLOGIC_RETRIEVER :=true #TARGET_WITH_AMLOGIC_PLAYERS :=true -#TARGET_WITH_AMNUPLAYER :=true -TARGET_WITH_MEDIA_EXT_LEVEL := 1 +#TARGET_WITH_MEDIA_EXT_LEVEL := 3 #set on some prducts,used libplayer. BUILD_WITH_BOOT_PLAYER :=true @@ -41,7 +40,6 @@ ifeq ($(TARGET_WITH_MEDIA_EXT_LEVEL), 1) else ifeq ($(TARGET_WITH_MEDIA_EXT_LEVEL), 2) TARGET_WITH_MEDIA_EXT :=true - TARGET_WITH_SWCODEC_EXT := true TARGET_WITH_CODEC_EXT := true else ifeq ($(TARGET_WITH_MEDIA_EXT_LEVEL), 3) @@ -55,19 +53,36 @@ endif ifeq ($(TARGET_WITH_MEDIA_EXT), true) PRODUCT_PACKAGES += \ - libammediaext \ - libamffmpeg \ - libamffmpegadapter + libammediaext + endif #soft codec related. # ifeq ($(TARGET_WITH_SWCODEC_EXT), true) PRODUCT_PACKAGES += \ + libamffmpeg \ + libamffmpegadapter \ libOmxCoreSw \ libstagefright_soft_amsoftdec endif +#codec ext related. +# +ifeq ($(TARGET_WITH_CODEC_EXT), true) +PRODUCT_PACKAGES += \ + libavenhancements + +endif + +#codec ext related. +# +ifeq ($(TARGET_WITH_PLAYERS_EXT), true) +BOARD_USE_CUSTOM_MEDIASERVEREXTENSIONS:=true +TARGET_WITH_AMNUPLAYER :=true + +endif + ######################################################################### # # PlayReady DRM @@ -222,7 +237,7 @@ PRODUCT_PACKAGES += libamadec_omx_api \ else #no libplayer but have amnuplayer ifeq ($(TARGET_WITH_AMNUPLAYER), true) -PRODUCT_PACKAGES += libmedia_amlogic +PRODUCT_PACKAGES += libamnuplayer endif #amnuplayer endif @@ -267,6 +282,10 @@ PRODUCT_COPY_FILES += \ BOARD_AML_MEDIAHAL_PATH := hardware/amlogic/media/ BOARD_AML_LIBAUDIO_PATH := hardware/amlogic/LibAudio/ +BOARD_AML_HARDWARE_PATH := hardware/amlogic/ +BOARD_AML_VENDOR_PATH := vendor/amlogic/ +AMLOGIC_FRAMEWORKS_AV_CONFIG_MK := $(BOARD_AML_VENDOR_PATH)/frameworks/av/mediaextconfig/config.mk +BOARD_AML_MEDIA_HAL_CONFIG := $(BOARD_AML_MEDIAHAL_PATH)/media_base_config.mk # for media modules PRODUCT_COPY_FILES += \ diff --git a/products/mbox/init.amlogic.rc b/products/mbox/init.amlogic.rc index e49cbe6..f08daf6 100644 --- a/products/mbox/init.amlogic.rc +++ b/products/mbox/init.amlogic.rc @@ -91,9 +91,9 @@ on boot insmod /vendor/lib/modules/ddr_window_64.ko chown media system /sys/class/tsync/pts_video - chown system mediadrm /sys/class/tsync/pts_audio - chown system mediadrm /sys/class/tsync/pts_pcrscr - chown system mediadrm /sys/class/tsync/event + chown mediadrm audio /sys/class/tsync/pts_audio + chown mediadrm audio /sys/class/tsync/pts_pcrscr + chown mediadrm audio /sys/class/tsync/event chown media system /sys/class/tsync/mode chown media system /sys/class/tsync/enable chown media system /sys/class/tsync/av_threshold_min @@ -149,6 +149,9 @@ on boot chmod 666 /sys/class/video/screen_mode chmod 666 /sys/class/video/disable_video chmod 666 /sys/class/tsync/pts_pcrscr + chmod 666 /sys/class/tsync/pts_audio + chmod 666 /sys/class/tsync/firstapts + chmod 666 /sys/class/tsync/event chmod 666 /dev/amstream_abuf chmod 666 /dev/amstream_hevc chmod 666 /dev/amstream_hevc_frame @@ -267,7 +270,7 @@ on boot chown system system /sys/class/amhdmitx/amhdmitx0/config chown system system /sys/class/amhdmitx/amhdmitx0/avmute chmod 644 /sys/class/amhdmitx/amhdmitx0/avmute - chown system mediadrm /sys/class/amhdmitx/amhdmitx0/aud_output_chs + chown mediadrm audio /sys/class/amhdmitx/amhdmitx0/aud_output_chs chown media system /sys/class/switch/hdmi/state chmod 0660 /sys/class/switch/hdmi/state chown media system /sys/devices/virtual/switch/hdmi/state diff --git a/products/tv/Vendor_0001_Product_0001.kl b/products/tv/Vendor_0001_Product_0001.kl new file mode 100644 index 0000000..d99ca50 --- a/dev/null +++ b/products/tv/Vendor_0001_Product_0001.kl @@ -0,0 +1,109 @@ +key 116 POWER +key 2 1 +key 3 2 +key 4 3 +key 5 4 +key 6 5 +key 7 6 +key 8 7 +key 9 8 +key 10 9 +key 11 0 +key 16 Q +key 17 W +key 18 E +key 19 R +key 20 T +key 21 Y +key 22 U +key 23 I +key 24 O +key 25 P +key 26 LEFT_BRACKET +key 27 RIGHT_BRACKET +key 43 BACKSLASH + +key 30 A +key 31 S +key 32 D +key 33 F +key 34 G +key 35 H +key 36 J +key 37 K +key 38 L +key 39 SEMICOLON +key 40 APOSTROPHE +key 14 DEL + +key 44 Z +key 45 X +key 46 C +key 47 V +key 48 B +key 49 N +key 50 M +key 51 COMMA +key 52 PERIOD +key 53 SLASH + +key 56 ALT_LEFT +key 100 ALT_RIGHT +key 42 SHIFT_LEFT +key 54 SHIFT_RIGHT +key 57 SPACE +key 58 SOFT_RIGHT +key 465 LAST_CHANNEL +key 402 CHANNEL_UP +key 403 CHANNEL_DOWN +key 115 VOLUME_UP +key 114 VOLUME_DOWN +key 113 VOLUME_MUTE +key 28 DPAD_CENTER +key 103 DPAD_UP +key 108 DPAD_DOWN +key 105 DPAD_LEFT +key 106 DPAD_RIGHT +key 158 CLEAR +key 139 MENU +key 102 HOME +key 398 PROG_RED +key 399 PROG_GREEN +key 400 PROG_YELLOW +key 401 PROG_BLUE +key 165 MEDIA_PREVIOUS +key 163 MEDIA_NEXT +key 168 MEDIA_REWIND +key 208 MEDIA_FAST_FORWARD +key 164 MEDIA_PLAY_PAUSE +key 166 MEDIA_STOP +key 167 MEDIA_RECORD + +key 155 ENVELOPE +key 12 MINUS +key 13 EQUALS +key 215 AT +key 130 ZOOM_IN +key 131 ZOOM_OUT +key 15 BACK +key 466 TV_INPUT +key 111 PAGE_UP +key 112 PAGE_DOWN +key 358 INFO +key 213 CAPTIONS +key 214 MEDIA_AUDIO_TRACK +key 216 NUM_LOCK +key 217 GUIDE + +#special for tv remote +#key 207 TV_SHORTCUTKEY_GLOBALSETUP +#key 464 TV_SHORTCUTKEY_3DMODE +#key 469 TV_SHORTCUTKEY_VIEWMODE +#key 470 TV_SHORTCUTKEY_VOICEMODE +#key 471 TV_SHORTCUTKEY_DISPAYMODE +#key 237 FAV +#key 238 LIST +#key 212 TV_REPEAT +#key 250 EARLY_POWER +#key 219 TV_SLEEP +#key 70 TV_BROWSER diff --git a/products/tv/init.amlogic.rc b/products/tv/init.amlogic.rc index 8b7670b..bad2ea1 100644 --- a/products/tv/init.amlogic.rc +++ b/products/tv/init.amlogic.rc @@ -27,6 +27,9 @@ on init chmod 666 /sys/class/video/disable_video chmod 666 /sys/class/tsync/enable chmod 666 /sys/class/tsync/pts_pcrscr + chmod 666 /sys/class/tsync/pts_audio + chmod 666 /sys/class/tsync/firstapts + chmod 666 /sys/class/tsync/event chmod 666 /sys/class/tsync/av_threshold_min chmod 666 /sys/class/video/screen_mode chmod 666 /sys/class/vdec/poweron_clock_level @@ -102,9 +105,10 @@ on boot insmod /vendor/lib/modules/ddr_window_64.ko chown media system /sys/class/tsync/pts_video - chown system mediadrm /sys/class/tsync/pts_audio - chown system mediadrm /sys/class/tsync/pts_pcrscr - chown system mediadrm /sys/class/tsync/event + chown mediadrm audio /sys/class/tsync/pts_audio + chown mediadrm audio /sys/class/tsync/pts_pcrscr + chown mediadrm audio /sys/class/tsync/event + chown mediadrm audio /sys/class/tsync/firstapts chown media system /sys/class/tsync/mode chown media system /sys/class/tsync/enable chown media system /sys/class/tsync/av_threshold_min diff --git a/products/tv/product_tv.mk b/products/tv/product_tv.mk index 0e8336f..3b499d1 100644 --- a/products/tv/product_tv.mk +++ b/products/tv/product_tv.mk @@ -135,3 +135,7 @@ DISPLAY_BUILD_NUMBER := true # default timezone PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.timezone=Asia/Shanghai + +#TV project,set omx to video layer,or PQ hasn't effect +PRODUCT_PROPERTY_OVERRIDES += \ + media.omx.display_mode=1 \ No newline at end of file diff --git a/sepolicy/e2fs.te b/sepolicy/e2fs.te index fdf7a97..2c04dcc 100644 --- a/sepolicy/e2fs.te +++ b/sepolicy/e2fs.te @@ -4,4 +4,5 @@ allow e2fs odm_block_device:blk_file getattr; allow e2fs system_block_fsck_device:blk_file getattr; allow e2fs tee_block_device:blk_file { getattr ioctl open read write }; allow e2fs vendor_block_device:blk_file getattr; -allow e2fs sysfs_fs_ext4_features:dir search; \ No newline at end of file +allow e2fs sysfs_fs_ext4_features:dir search; +allow e2fs param_block_device:blk_file { getattr ioctl open read write }; \ No newline at end of file diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 22b94f8..06121e9 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -88,6 +88,10 @@ /sys/class/video/axis u:object_r:sysfs_video:s0 /sys/class/tsync/enable u:object_r:sysfs_video:s0 /sys/class/audiodsp/digital_raw u:object_r:sysfs_audio:s0 +/sys/class/tsync/firstapts u:object_r:sysfs_xbmc:s0 +/sys/class/tsync/pts_audio u:object_r:sysfs_xbmc:s0 +/sys/class/tsync/event u:object_r:sysfs_xbmc:s0 +/sys/class/tsync/pts_pcrscr u:object_r:sysfs_xbmc:s0 /sys/class/audiodsp/digital_codec u:object_r:sysfs_digital_codec:s0 /sys/class/audiodsp/audio_samesource u:object_r:sysfs_audio_samesource:s0 diff --git a/sepolicy/init.te b/sepolicy/init.te index f151ce8..f71be94 100644 --- a/sepolicy/init.te +++ b/sepolicy/init.te @@ -83,7 +83,7 @@ allow init firmload_exec:file {getattr}; #allow init functionfs:file mounton; #allow init functionfs:dir mounton; #allow init system_data_file:file {link}; -#allow init debugfs:dir mounton; +allow init debugfs:dir mounton; #allow init debugfs:file w_file_perms; #allow init userdata_block_device:blk_file rw_file_perms; #allow init cache_block_device:blk_file rw_file_perms; diff --git a/sepolicy/system_control.te b/sepolicy/system_control.te index 86715dc..7aa57f1 100644 --- a/sepolicy/system_control.te +++ b/sepolicy/system_control.te @@ -18,6 +18,7 @@ allow system_control sysfs_devices_system_cpu:file rw_file_perms; allow system_control system_control:netlink_kobject_uevent_socket { create setopt bind read shutdown }; allow system_control self:capability { net_admin }; +allow system_control vendor_shell_exec:file execute_no_trans; #unix_socket_connect(system_control, vold, vold); #unix_socket_connect(system_control, property, init); -- cgit