commit a57da42f967089081914426167ee2f6efe5bc361
author Trevor Drake <trevd1234@gmail.com> Tue Feb 14 07:52:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 14 07:52:04 2017 +0000
tree fe6d65be1a91b4234224b692f2698bcec5820ada
parent 7346753baa572f237b08342ac3c9352fd44a8df3
parent e79bfe88580089efcc8d616f54900a56385d3654

Do not clobber existing BOARD_SEPOLICY_DIRS am: 4c3feadddf am: 46cfd83bd9 am: efc560e993
am: e79bfe8858

Change-Id: If011e88d92eda366902e180041786a30bbd22715

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8439cbc..ccd7775 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_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/linaro/hikey/bluetooth

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 3dda70e..218d01b 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 \