hikey: remove redundant CONFIG_DRIVER_NL80211 :=y am: 1b597d4458 am: 2a342adc4d am: 9e980b2cd6
am: fbaf2fbf7d
Change-Id: I23e1a71744dcdbabd20e1b172bc466d20ddb4a3c
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ab7680a..10356bb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -45,6 +45,9 @@
BOARD_SEPOLICY_DIRS += device/linaro/hikey/sepolicy
+DEVICE_MANIFEST_FILE := device/linaro/hikey/manifest.xml
+DEVICE_MATRIX_FILE := device/linaro/hikey/compatibility_matrix.xml
+
ifeq ($(HOST_OS), linux)
ifeq ($(TARGET_SYSTEMIMAGES_USE_SQUASHFS), true)
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..8fde25c
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,30 @@
+<compatibility-matrix version="1.0" type="device">
+ <hal format="hidl" optional="false">
+ <name>android.frameworks.schedulerservice</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.frameworks.sensorservice</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.allocator</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.manager</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.memory</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.token</name>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.system.wifi.keystore</name>
+ <version>1.0</version>
+ </hal>
+</compatibility-matrix>
diff --git a/device-common.mk b/device-common.mk
index 757059d..f328861 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -25,7 +25,6 @@
# 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
@@ -85,7 +84,6 @@
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/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