commit 781bd6409dafab4b4daa4b749af3806dae554015
author Myles Watson <mylesgw@google.com> Wed Mar 15 21:26:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 21:26:32 2017 +0000
tree a6db355a200484f75334db5b32a08284688a8685
parent 32f32a75a468bec3ef693f3a1b689e1c98ec3f6f
parent 143cfc373f63cd378df5d0fbc3244140e1a13b9e

Merge "Bluetooth: Add death recipient" am: 5e2670e4bc am: df56c1f3c6
am: 143cfc373f

Change-Id: I64f6c161ac7e91b7d819fc8ff23142ec83e3d7ee

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 d4aa0da..757059d 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -45,6 +45,9 @@
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
 
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl \
+
 # 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
@@ -58,6 +61,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 \
@@ -74,7 +85,7 @@
         frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
         frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
         frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
-        device/linaro/hikey/vintf.xml:vendor/manifest.xml \
+        device/linaro/hikey/manifest.xml:vendor/manifest.xml \
         device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
         device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf
 

manifest.xml

diff --git a/vintf.xml b/manifest.xml
similarity index 100%
rename from vintf.xml
rename to manifest.xml