commit b5083a3c2342d6dadeb492f0aef2fc4c6a3600f6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 09 21:12:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 09 21:12:48 2018 +0000
tree 1ec849ef36586cd23a43c9f3e23421cd1bebf586
parent ea370f3c07e0621dcc660b794ee0f223347e8feb
parent a6bb66b87c538a60067c7b37cdfa044d55dba347

Merge "hikey960: Add build option TARGET_BUILTIN_EDID"

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index b07047f..40cb0e3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -23,7 +23,7 @@
 PRODUCT_IS_ATV := true
 else
 # Adjust the dalvik heap to be appropriate for a tablet.
-$(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+$(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
 endif
 
 # Set vendor kernel path
@@ -196,7 +196,7 @@
         frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml
 
 # Include BT modules
-$(call inherit-product-if-exists, device/linaro/hikey/wpan/ti-wpan-products.mk)
+$(call inherit-product, device/linaro/hikey/wpan/ti-wpan-products.mk)
 
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
@@ -228,6 +228,7 @@
     android.hardware.graphics.allocator@2.0.vndk-sp\
     android.hardware.graphics.mapper@2.0.vndk-sp\
     android.hardware.graphics.common@1.0.vndk-sp\
+    android.hardware.power@1.0.vndk-sp\
     libvndksupport.vndk-sp\
     libbinder.vndk-sp\
     libhwbinder.vndk-sp\