summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-23 04:46:26 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-23 04:46:37 (GMT)
commitc03df1ad1d429456cf5ea605eeda1d1d52274e82 (patch)
treec413c7930120410e5cbb981cb41fecade61db93e
parent4bd33336eb4caaf7e29d00b3c355d556c79ba293 (diff)
downloadcurie-c03df1ad1d429456cf5ea605eeda1d1d52274e82.zip
curie-c03df1ad1d429456cf5ea605eeda1d1d52274e82.tar.gz
curie-c03df1ad1d429456cf5ea605eeda1d1d52274e82.tar.bz2
curie: sync to 8.1 cdde2d4276 [5/6]
PD# 158649 sync to 8.1 cdde2d4276 Change-Id: I120a1f8a64fd941569c1bbb2cb87c84defa471a3
Diffstat
-rw-r--r--curie.mk1
-rw-r--r--device.mk9
-rw-r--r--system.prop3
3 files changed, 9 insertions, 4 deletions
diff --git a/curie.mk b/curie.mk
index 1e2b1c1..4381093 100644
--- a/curie.mk
+++ b/curie.mk
@@ -288,7 +288,6 @@ endif
ifeq ($(BOARD_WIDEVINE_OEMCRYPTO_LEVEL), 1)
TARGET_USE_OPTEEOS := true
-TARGET_ENABLE_TA_SIGN := true
TARGET_USE_HW_KEYMASTER := true
endif
diff --git a/device.mk b/device.mk
index 2c9094a..8759fd4 100644
--- a/device.mk
+++ b/device.mk
@@ -55,8 +55,15 @@ PRODUCT_COPY_FILES += \
# remote IME config file
PRODUCT_COPY_FILES += \
- device/amlogic/curie/files/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
+ device/amlogic/curie/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/curie/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 mdpi
PRODUCT_AAPT_PREF_CONFIG := mdpi
diff --git a/system.prop b/system.prop
index 7efaf7e..e142629 100644
--- a/system.prop
+++ b/system.prop
@@ -21,7 +21,7 @@ ro.radio.noril=false
ro.net.pppoe=true
# Low memory platform
-ro.config.low_ram=false
+ro.config.low_ram=true
#the prop is used for enable or disable
#DD+/DD force output when HDMI EDID is not supported
@@ -188,4 +188,3 @@ ubootenv.var.colorattribute=
ro.hwui.texture_cache_size=18.0f
ro.hwui.layer_cache_size=15.0f
-debug.sf.latch_unsignaled=1