commit 4c23d0256087c759f0b82fc1f0cc5f94208d8063
author Myles Watson <mylesgw@google.com> Wed Mar 08 18:00:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 08 18:00:35 2017 +0000
tree 5c0bcdb544845a1ccffed0760a9e6af0ed99c60c
parent 9103656708ff1534686be7a9414badee07e73dbd
parent 42da68fa123c7b1f2c343136daea0b3d394346a4

hikey: Make the Hikey Bluetooth HAL independent am: 761dc49c59 am: dcab6b3def
am: 42da68fa12

Change-Id: I60839a52013f38217e133641bc502587410bb213

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..b541e8a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -25,6 +25,7 @@
 
 # Add wifi-related packages
 PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd
+PRODUCT_PACKAGES += android.hardware.wifi@1.0-service
 PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \
                               wifi.supplicant_scan_interval=15
 
@@ -44,6 +45,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 +66,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 \
@@ -73,7 +90,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
 

init.common.rc

diff --git a/init.common.rc b/init.common.rc
index 318ffc9..81c7aa2 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -94,7 +94,7 @@
     group bluetooth net_bt_admin system
     oneshot
 
-service wpa_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
      -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
      -e/data/misc/wifi/entropy.bin  -g@android:wpa_wlan0
      socket wpa_wlan0 dgram 660 wifi wifi

manifest.xml

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