summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-23 04:47:27 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-23 04:47:32 (GMT)
commitfb4ea45573a50b3701ac75d96c344cf3061ece95 (patch)
tree2090eb146330e500c9780235050682d5977d755d
parent1463933a3ab12c201197e2e8867edf77585a4e1c (diff)
downloaddarwin-fb4ea45573a50b3701ac75d96c344cf3061ece95.zip
darwin-fb4ea45573a50b3701ac75d96c344cf3061ece95.tar.gz
darwin-fb4ea45573a50b3701ac75d96c344cf3061ece95.tar.bz2
darwin: sync to 8.1 cdde2d4276 [6/6]
PD# 158649 sync to 8.1 cdde2d4276 Change-Id: I7bee640d9e882da1b0d6ee7986d98c8f50516c9d
Diffstat
-rw-r--r--device.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 560732d..de47542 100644
--- a/device.mk
+++ b/device.mk
@@ -40,8 +40,14 @@ PRODUCT_COPY_FILES += \
device/amlogic/darwin/files/remote.conf:$(TARGET_COPY_OUT_VENDOR)/etc/remote.conf \
device/amlogic/darwin/files/remote.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/remote.cfg \
device/amlogic/darwin/files/remote.tab:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab \
- device/amlogic/common/products/tv/Vendor_0001_Product_0001.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
+ device/amlogic/common/products/tv/Vendor_0001_Product_0001.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl
+ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
+PRODUCT_COPY_FILES += \
device/amlogic/darwin/files/Generic.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
+else
+PRODUCT_COPY_FILES += \
+ device/amlogic/common/Generic.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
+endif
# recovery
PRODUCT_COPY_FILES += \