author | yidong.zhang <yidong.zhang@amlogic.com> | 2020-11-09 02:40:37 (GMT) |
---|---|---|
committer | Tellen Yu <tellen.yu@amlogic.com> | 2020-11-12 10:55:26 (GMT) |
commit | f288cc8c4ce146490a1378b4a137f7ad971c994a (patch) | |
tree | 7e5be5a98a41af73a05a0f6feb69c38163e6562d | |
parent | bf6a1bde47732629922d162d70583d77c973eabe (diff) | |
download | common-f288cc8c4ce146490a1378b4a137f7ad971c994a.zip common-f288cc8c4ce146490a1378b4a137f7ad971c994a.tar.gz common-f288cc8c4ce146490a1378b4a137f7ad971c994a.tar.bz2 |
device/common: enable aosp local video display[1/7]
PD#SWPL-34970
Problem:
local mp4 video cannot display
Solution:
export BOARD_COMPILE_ATV=false to build aosp img
Verify:
newton
Change-Id: I723f0374d54d35c311d355b5c6e2cf7f2880a852
Signed-off-by: yidong zhang <yidong.zhang@amlogic.com>
-rwxr-xr-x | core_amlogic.mk | 19 | ||||
-rw-r--r-- | media.mk | 7 | ||||
-rw-r--r-- | products/mbox/g12a/device.mk | 5 | ||||
-rw-r--r-- | products/mbox/g12a/files/Generic.kl | 443 | ||||
-rw-r--r-- | products/mbox/g12a/g12a.mk | 18 | ||||
-rw-r--r-- | products/mbox/gxl/device.mk | 5 | ||||
-rwxr-xr-x | products/mbox/gxl/files/Generic.kl | 443 | ||||
-rw-r--r-- | products/mbox/gxl/gxl.mk | 18 | ||||
-rw-r--r-- | products/mbox/product_mbox.mk | 17 | ||||
-rw-r--r-- | products/mbox/sc2/device.mk | 5 | ||||
-rw-r--r-- | products/mbox/sc2/files/Generic.kl | 443 | ||||
-rw-r--r-- | products/mbox/sc2/sc2.mk | 17 | ||||
-rw-r--r-- | products/mbox/sm1/device.mk | 5 | ||||
-rw-r--r-- | products/mbox/sm1/files/Generic.kl | 443 | ||||
-rw-r--r-- | products/mbox/sm1/sm1.mk | 18 | ||||
-rw-r--r-- | products/tv/product_tv.mk | 18 | ||||
-rwxr-xr-x | products/tv/tl1/files/Generic.kl | 442 | ||||
-rw-r--r-- | products/tv/tl1/tl1.mk | 18 | ||||
-rw-r--r-- | products/tv/tl1/vendor_prop.mk | 2 | ||||
-rwxr-xr-x | products/tv/tm2/files/Generic.kl | 442 | ||||
-rw-r--r-- | products/tv/tm2/tm2.mk | 17 | ||||
-rw-r--r-- | software.mk | 73 |
22 files changed, 31 insertions, 2887 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index a8055cb..a56b7d1 100755 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -1,12 +1,13 @@ # To prevent from including GMS twice in Google's internal source. ifeq ($(wildcard vendor/unbundled_google),) -ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) +ifneq ($(BOARD_COMPILE_ATV), false) PRODUCT_USE_PREBUILT_GTVS := yes +DONT_DEXPREOPT_PREBUILTS := true endif endif ifneq ($(wildcard vendor/google_gtvs),) -ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) +ifneq ($(BOARD_COMPILE_ATV), false) include vendor/amlogic/common/gms/google/gms.mk include vendor/amlogic/common/gms/google/mainline_modules_atv.mk endif @@ -38,7 +39,7 @@ endif PRODUCT_PACKAGES += \ netutils-wrapper-1.0 -ifeq ($(TARGET_BUILD_GOOGLE_ATV),true) +ifneq ($(BOARD_COMPILE_ATV), false) PRODUCT_PACKAGES += \ PlayAutoInstallStub \ DroidOverlay \ @@ -111,8 +112,8 @@ else WITH_LIBPLAYER_MODULE := false endif -$(warning TARGET_BUILD_GOOGLE_ATV is $(TARGET_BUILD_GOOGLE_ATV)) -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) +$(warning BOARD_COMPILE_ATV is $(BOARD_COMPILE_ATV)) +ifeq ($(BOARD_COMPILE_ATV), false) PRODUCT_PACKAGES += \ AppInstaller \ FileBrowser \ @@ -122,12 +123,14 @@ PRODUCT_PACKAGES += \ MboxLauncher \ DLNA \ BluetoothRemote \ + VideoPlayer \ + OTAUpgrade \ Gallery2 endif PRODUCT_PACKAGES += \ - VideoPlayer \ - OTAUpgrade \ + Bluetooth \ + PrintSpooler \ SubTitle PRODUCT_PACKAGES += \ @@ -362,12 +365,10 @@ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-service-droidlogic #Camera HAL -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) PRODUCT_PACKAGES += \ camera.amlogic \ android.hardware.camera.provider@2.5-legacy \ android.hardware.camera.provider@2.5-service -#endif #Power HAL ifneq ($(TARGET_BUILD_NEW_DEVICE),true) @@ -12,11 +12,8 @@ # limitations under the License. -ifeq ($(TARGET_BUILD_CTS),true) -BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 1 -BOARD_PLAYREADY_LEVEL := 1 -TARGET_BUILD_NETFLIX:= true -endif +BOARD_WIDEVINE_OEMCRYPTO_LEVEL ?= 1 +BOARD_PLAYREADY_LEVEL ?= 1 ifeq ($(BOARD_WIDEVINE_OEMCRYPTO_LEVEL),) BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 3 diff --git a/products/mbox/g12a/device.mk b/products/mbox/g12a/device.mk index 6032950..3ce1d15 100644 --- a/products/mbox/g12a/device.mk +++ b/products/mbox/g12a/device.mk @@ -45,11 +45,6 @@ PRODUCT_COPY_FILES += \ device/amlogic/common/products/mbox/g12a/files/remote.tab2:recovery/root/sbin/remote.tab2 \ device/amlogic/common/products/mbox/g12a/files/remote.tab3:recovery/root/sbin/remote.tab3 \ -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/products/mbox/g12a/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl -endif - ######################################################################### # # Recovery diff --git a/products/mbox/g12a/files/Generic.kl b/products/mbox/g12a/files/Generic.kl deleted file mode 100644 index 61d6c5b..0000000 --- a/products/mbox/g12a/files/Generic.kl +++ b/dev/null @@ -1,443 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/mbox/g12a/g12a.mk b/products/mbox/g12a/g12a.mk index 3b0cf57..2814893 100644 --- a/products/mbox/g12a/g12a.mk +++ b/products/mbox/g12a/g12a.mk @@ -19,24 +19,14 @@ ######################################################################## # -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - -######################################################################## -# # Netflix mgkid # ######################################################################## -ifeq ($(TARGET_BUILD_CTS),true) +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true TARGET_BUILD_NETFLIX_MGKID := true endif + ######################################################################## ######################################################################## @@ -298,9 +288,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/products/mbox/gxl/device.mk b/products/mbox/gxl/device.mk index 29ff1f1..bb44eee 100644 --- a/products/mbox/gxl/device.mk +++ b/products/mbox/gxl/device.mk @@ -48,11 +48,6 @@ PRODUCT_COPY_FILES += \ device/amlogic/common/products/mbox/gxl/files/remote.tab3:recovery/root/sbin/remote.tab3 \ device/amlogic/common/products/mbox/gxl/recovery/sh:recovery/root/sbin/sh -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/products/mbox/gxl/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl -endif - ######################################################################### # # Init config diff --git a/products/mbox/gxl/files/Generic.kl b/products/mbox/gxl/files/Generic.kl deleted file mode 100755 index 61d6c5b..0000000 --- a/products/mbox/gxl/files/Generic.kl +++ b/dev/null @@ -1,443 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/mbox/gxl/gxl.mk b/products/mbox/gxl/gxl.mk index 4b1f5ee..a02065a 100644 --- a/products/mbox/gxl/gxl.mk +++ b/products/mbox/gxl/gxl.mk @@ -19,24 +19,14 @@ ######################################################################## # -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - -######################################################################## -# # Netflix mgkid # ######################################################################## -ifeq ($(TARGET_BUILD_CTS),true) +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true TARGET_BUILD_NETFLIX_MGKID := true endif + ######################################################################## ######################################################################## @@ -298,9 +288,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/products/mbox/product_mbox.mk b/products/mbox/product_mbox.mk index 17063ec..92231b5 100644 --- a/products/mbox/product_mbox.mk +++ b/products/mbox/product_mbox.mk @@ -105,14 +105,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml -#usb accessory donnot need in atv -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml -endif - - - custom_keylayouts := $(wildcard device/amlogic/common/keyboards/*.kl) PRODUCT_COPY_FILES += $(foreach file,$(custom_keylayouts),\ $(file):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(notdir $(file))) @@ -145,14 +137,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ vendor.media.sf.omxvideo-optmize=1 -######################################################################### -# -# Camera -# -######################################################################### -ifneq ($(TARGET_BUILD_CTS), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.external.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.external.xml -endif BOARD_HAVE_CEC_HIDL_SERVICE := true diff --git a/products/mbox/sc2/device.mk b/products/mbox/sc2/device.mk index 7838aca..83966d3 100644 --- a/products/mbox/sc2/device.mk +++ b/products/mbox/sc2/device.mk @@ -47,11 +47,6 @@ PRODUCT_COPY_FILES += \ $(CHIP_DIR)/files/remote.tab2:recovery/root/sbin/remote.tab2 \ $(CHIP_DIR)/files/remote.tab3:recovery/root/sbin/remote.tab3 \ -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - $(CHIP_DIR)/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl -endif - ######################################################################### # # Recovery diff --git a/products/mbox/sc2/files/Generic.kl b/products/mbox/sc2/files/Generic.kl deleted file mode 100644 index 61d6c5b..0000000 --- a/products/mbox/sc2/files/Generic.kl +++ b/dev/null @@ -1,443 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/mbox/sc2/sc2.mk b/products/mbox/sc2/sc2.mk index 5010410..cc6055b 100644 --- a/products/mbox/sc2/sc2.mk +++ b/products/mbox/sc2/sc2.mk @@ -19,30 +19,21 @@ -######################################################################## -# -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - ######################################################################### # # 3rd party app config # ######################################################################### #Netflix +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true ifeq ($(TARGET_BUILD_NETFLIX), true) TARGET_WITH_VP9_NETFLIX:= true $(call inherit-product-if-exists, device/amlogic/common/nts/nts.mk) PRODUCT_COPY_FILES += \ device/amlogic/common/droidlogic.software.netflix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/droidlogic.software.netflix.xml endif +endif ######################################################################## # Dynamic enable start/stop zygote_secondary in 64bits @@ -310,9 +301,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/products/mbox/sm1/device.mk b/products/mbox/sm1/device.mk index 208f580..2e765b7 100644 --- a/products/mbox/sm1/device.mk +++ b/products/mbox/sm1/device.mk @@ -45,11 +45,6 @@ PRODUCT_COPY_FILES += \ device/amlogic/common/products/mbox/sm1/files/remote.tab2:recovery/root/sbin/remote.tab2 \ device/amlogic/common/products/mbox/sm1/files/remote.tab3:recovery/root/sbin/remote.tab3 \ -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/products/mbox/sm1/files/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl -endif - ######################################################################### # # Recovery diff --git a/products/mbox/sm1/files/Generic.kl b/products/mbox/sm1/files/Generic.kl deleted file mode 100644 index 61d6c5b..0000000 --- a/products/mbox/sm1/files/Generic.kl +++ b/dev/null @@ -1,443 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/mbox/sm1/sm1.mk b/products/mbox/sm1/sm1.mk index b9db838..93e28fa 100644 --- a/products/mbox/sm1/sm1.mk +++ b/products/mbox/sm1/sm1.mk @@ -19,24 +19,14 @@ ######################################################################## # -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - -######################################################################## -# # Netflix mgkid # ######################################################################## -ifeq ($(TARGET_BUILD_CTS),true) +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true TARGET_BUILD_NETFLIX_MGKID := true endif + ######################################################################## ######################################################################## @@ -298,9 +288,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/products/tv/product_tv.mk b/products/tv/product_tv.mk index f5d76b4..3f27b26 100644 --- a/products/tv/product_tv.mk +++ b/products/tv/product_tv.mk @@ -78,12 +78,6 @@ endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml -#usb accessory donnot need in atv -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml -endif - custom_keylayouts := $(wildcard device/amlogic/common/keyboards/*.kl) PRODUCT_COPY_FILES += $(foreach file,$(custom_keylayouts),\ $(file):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(notdir $(file))) @@ -97,7 +91,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bootvideo.zip:$(TARGET_COPY_OUT_VENDOR)/etc/bootvideo.zip \ $(LOCAL_PATH)/tv.mp4:$(TARGET_COPY_OUT_VENDOR)/etc/bootvideo -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) +ifeq ($(BOARD_COMPILE_ATV), false) # default wallpaper for mbox to fix bug 106225 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/default_wallpaper.png:$(TARGET_COPY_OUT_VENDOR)/etc/default_wallpaper.png @@ -124,14 +118,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ #TV project, need use 8 ch 32 bit output. TARGET_WITH_TV_AUDIO_MODE := true -######################################################################### -# -# Camera -# -######################################################################### - -ifneq ($(TARGET_BUILD_CTS), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.external.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.external.xml -endif BOARD_HAVE_CEC_HIDL_SERVICE := true diff --git a/products/tv/tl1/files/Generic.kl b/products/tv/tl1/files/Generic.kl deleted file mode 100755 index 9db0523..0000000 --- a/products/tv/tl1/files/Generic.kl +++ b/dev/null @@ -1,442 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/tv/tl1/tl1.mk b/products/tv/tl1/tl1.mk index c2b8365..0c3bf83 100644 --- a/products/tv/tl1/tl1.mk +++ b/products/tv/tl1/tl1.mk @@ -19,24 +19,14 @@ ######################################################################## # -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - -######################################################################## -# # Netflix mgkid # ######################################################################## -ifeq ($(TARGET_BUILD_CTS),true) +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true TARGET_BUILD_NETFLIX_MGKID := true endif + ######################################################################## ######################################################################## @@ -298,9 +288,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/products/tv/tl1/vendor_prop.mk b/products/tv/tl1/vendor_prop.mk index 336e99a..8ddfd1b 100644 --- a/products/tv/tl1/vendor_prop.mk +++ b/products/tv/tl1/vendor_prop.mk @@ -127,7 +127,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ #-----------------------|050 #050:default volume value, volume range 0~100 #note that the high position 0 can not be omitted -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) +ifeq ($(BOARD_COMPILE_ATV), false) PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.media.bootvideo=3050 endif diff --git a/products/tv/tm2/files/Generic.kl b/products/tv/tm2/files/Generic.kl deleted file mode 100755 index 9db0523..0000000 --- a/products/tv/tm2/files/Generic.kl +++ b/dev/null @@ -1,442 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -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 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -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 28 DPAD_CENTER -key 29 CTRL_LEFT -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 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -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 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN -#for xiaomi bt remote -key usage 0x07004a HOME - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/products/tv/tm2/tm2.mk b/products/tv/tm2/tm2.mk index e56046c..6ea5794 100644 --- a/products/tv/tm2/tm2.mk +++ b/products/tv/tm2/tm2.mk @@ -19,22 +19,11 @@ ######################################################################## # -# ATV -# -######################################################################## -ifneq ($(BOARD_COMPILE_ATV),false) -TARGET_BUILD_CTS := true -TARGET_BUILD_GOOGLE_ATV:= true -DONT_DEXPREOPT_PREBUILTS:= true -endif -######################################################################## - -######################################################################## -# # Netflix mgkid # ######################################################################## -ifeq ($(TARGET_BUILD_CTS),true) +ifneq ($(BOARD_COMPILE_ATV),false) +TARGET_BUILD_NETFLIX := true TARGET_BUILD_NETFLIX_MGKID := true endif ######################################################################## @@ -301,9 +290,7 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p # PPPOE # ################################################################################# -#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) #BUILD_WITH_PPPOE := false -#endif ifeq ($(BUILD_WITH_PPPOE),true) PRODUCT_PACKAGES += \ diff --git a/software.mk b/software.mk deleted file mode 100644 index 2a01777..0000000 --- a/software.mk +++ b/dev/null @@ -1,73 +0,0 @@ -ifeq ($(TARGET_BUILD_CTS), true) - -#ADDITIONAL_DEFAULT_PROPERTIES += ro.vold.forceencryption=1 -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.screen.landscape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.landscape.xml \ - frameworks/native/data/etc/android.software.cts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.cts.xml \ - frameworks/native/data/etc/android.software.voice_recognizers.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.voice_recognizers.xml - -ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/android.software.google_atv.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.google_atv.xml -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.live_tv.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.live_tv.xml -PRODUCT_PACKAGE_OVERLAYS += device/amlogic/common/atv_gms_overlay -PRODUCT_PACKAGES += \ - TvProvider \ - GooglePackageInstaller \ - com.android.media.tv.remoteprovider.xml \ - com.android.media.tv.remoteprovider -$(call add-clean-step, rm -rf $(OUT_DIR)/vendor/etc/permissions/android.hardware.camera.front.xml) -$(call add-clean-step, rm -rf $(OUT_DIR)/vendor/priv-app/DLNA) - -else -#PRODUCT_PACKAGE_OVERLAYS += device/amlogic/common/aosp_gms_overlay -#PRODUCT_PACKAGES += \ -# QuickSearchBox \ -# Contacts \ -# Calendar \ -# BlockedNumberProvider \ -# BookmarkProvider \ -# MtpDocumentsProvider \ -# DownloadProviderUi -endif - -PRODUCT_PROPERTY_OVERRIDES += \ - persist.sys.app.rotation=original \ - vendor.media.amplayer.widevineenable=true \ - vendor.media.sync.limit=1 - -#WITH_DEXPREOPT := true -#WITH_DEXPREOPT_PIC := true - -PRODUCT_PACKAGES += \ - Bluetooth \ - PrintSpooler - -else -PRODUCT_PACKAGES += \ - libfwdlockengine - -PRODUCT_PROPERTY_OVERRIDES += \ - persist.sys.app.rotation=middle_port - -endif - -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml -PRODUCT_PACKAGES += \ - ManagedProvisioning -endif - -ifeq ($(TARGET_BUILD_NETFLIX), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/droidlogic.software.netflix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/droidlogic.software.netflix.xml -endif - -ifeq ($(BOARD_AVB_ENABLE), true) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml -endif - -$(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk) |