Merge "Add METADATA to hikey: contains GPL=RESTRICTED" am: 6986ea120f am: 5e90159352
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1300175
Change-Id: I75ca53e224ff67d1b67ec32c0fa93eeae93639c2
diff --git a/device-common.mk b/device-common.mk
index 9013f03..f69cc5b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -75,7 +75,6 @@
android.hardware.audio@4.0-impl:32 \
android.hardware.audio.effect@4.0-impl:32 \
android.hardware.audio@2.0-service \
- android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl \
android.hardware.bluetooth.audio@2.0-impl
@@ -85,8 +84,6 @@
android.hardware.drm@1.0-impl \
android.hardware.drm@1.0-service
-PRODUCT_PACKAGES += libGLES_android
-
# Graphics HAL
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@2.0-impl \
diff --git a/init.common.rc b/init.common.rc
index 53f446c..1ae164b 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -109,8 +109,7 @@
oneshot
seclabel u:r:watchdogd:s0
-service bugreport /system/bin/dumpstate -d -p -B -z \
- -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
+service bugreport /system/bin/dumpstate -d -p -z
class main
disabled
oneshot
diff --git a/manifest.xml b/manifest.xml
index fd6f383..42b8a8f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -165,22 +165,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.wifi.hostapd</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IHostapd</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.wifi.supplicant</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>ISupplicant</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>