From c3f7f7e5796f13127cadad4b34dbd49994b09e48 Mon Sep 17 00:00:00 2001
From: Xindong Xu<xindong.xu@amlogic.com>
Date: Tue, 23  Jan  2018  04:42:47  +0000
Subject: ampere: sync to 8.1 cdde2d4276 [2/6]

PD# 158649

sync to 8.1 cdde2d4276

Change-Id: I0ac6a66e89e2aafe3ea0d2e3ff1ce14ee636f53a
---
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
 
--
cgit