commit 5a0b32f8ebf01cacd257d0c7f12f678df2df56e7
author Myles Watson <mylesgw@google.com> Fri Feb 24 14:28:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 14:28:55 2017 +0000
tree aa08d088096cf927c96034f8aee11a64109c58c5
parent 10fe663313c997618576902293462d6855483fe4
parent 9b80b8ccfb79c08cc7073d4d14d9ca2f19c19525

hikey: Add the vintf.xml manifest file am: e4a28299c9 am: 96569410e4
am: 9b80b8ccfb

Change-Id: I92979d4566868ad80299baf467a8617d339daf01

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a14e233..3b744b3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -17,7 +17,6 @@
 
 WITH_DEXPREOPT ?= true
 USE_OPENGL_RENDERER := true
-ANDROID_ENABLE_RENDERSCRIPT := true
 
 # BT configs
 BOARD_HAVE_BLUETOOTH := true

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index c23f0b5..72f15a4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -44,6 +44,14 @@
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
 
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl \
+
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-service
+endif
+
 # Set zygote config
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc
@@ -57,6 +65,14 @@
 # PowerHAL
 PRODUCT_PACKAGES += android.hardware.power@1.0-impl
 
+#GNSS HAL
+PRODUCT_PACKAGES += \
+    android.hardware.gnss@1.0-impl
+
+# Keymaster HAL
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@3.0-impl
+
 # Copy hardware config file(s)
 PRODUCT_COPY_FILES +=  \
         device/linaro/hikey/etc/permissions/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \