summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-23 04:42:47 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-23 04:42:47 (GMT)
commitc3f7f7e5796f13127cadad4b34dbd49994b09e48 (patch)
tree0798ebde9bf4a7bda3e24eb73207be7589ebb17c
parent2a04748d3395eba654314885a6ce41608d17e8b7 (diff)
downloadampere-c3f7f7e5796f13127cadad4b34dbd49994b09e48.zip
ampere-c3f7f7e5796f13127cadad4b34dbd49994b09e48.tar.gz
ampere-c3f7f7e5796f13127cadad4b34dbd49994b09e48.tar.bz2
ampere: sync to 8.1 cdde2d4276 [2/6]
PD# 158649 sync to 8.1 cdde2d4276 Change-Id: I0ac6a66e89e2aafe3ea0d2e3ff1ce14ee636f53a
Diffstat
-rw-r--r--device.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index d6b0126..fd56c66 100644
--- a/device.mk
+++ b/device.mk
@@ -55,8 +55,15 @@ PRODUCT_COPY_FILES += \
# remote IME config file
PRODUCT_COPY_FILES += \
- device/amlogic/ampere/files/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
+ device/amlogic/ampere/files/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/ampere/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
+
PRODUCT_AAPT_CONFIG := xlarge hdpi xhdpi
PRODUCT_AAPT_PREF_CONFIG := hdpi