summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-23 04:43:33 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-23 04:43:40 (GMT)
commit077c94853f7c47a9cc1d173467f6add0b8653492 (patch)
tree5ccf9ac1e0830d8ff97048b45b9888c89da4b44a
parentfdd62c78251b592211ebb7d13f1d64a60c03957d (diff)
downloadbraun-077c94853f7c47a9cc1d173467f6add0b8653492.zip
braun-077c94853f7c47a9cc1d173467f6add0b8653492.tar.gz
braun-077c94853f7c47a9cc1d173467f6add0b8653492.tar.bz2
braun: sync to 8.1 cdde2d4276 [3/6]
PD# 158649 sync to 8.1 cdde2d4276 Change-Id: I0d3b995beefbd050cc9fa6e4cd691ac8bbd841d8
Diffstat
-rw-r--r--device.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 8f2478b..94b7530 100644
--- a/device.mk
+++ b/device.mk
@@ -51,8 +51,14 @@ PRODUCT_COPY_FILES += \
# remote IME config file
PRODUCT_COPY_FILES += \
- device/amlogic/braun/files/Vendor_0001_Product_0001.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
+ device/amlogic/braun/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/braun/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