commit ba652422f12c2037a690a84e338c94f059252f08
author Alistair Delva <adelva@google.com> Wed Nov 27 12:57:47 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 12:57:47 2019 -0800
tree d8d3e9da83e899e25a8fa11ae0b2c5fd1305916a
parent ed77f045d4a98b73f1b15a07d6de8fb44a21ee48
parent 6aa7c17f1b76aa60df78c9a20ff1a72513a0f1de

Merge "Revert "hikey: Create PDX socket dirs"" am: b822fce207 am: cfa6adf392
am: 6aa7c17f1b

Change-Id: Ie6d66488f87394c30eb4888a341dbab14c83b6ef

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 5d38628..cd0ac2d 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -85,8 +85,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 \

init.common.rc

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

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 63c1e9f..bbf19bb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -157,15 +157,6 @@
         </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>
-    <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>
         <version>1.0</version>