commit 2012b5e05b0b592c1756638890103c75fd8898e1
author Xin Li <delphij@google.com> Wed Oct 30 14:41:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 14:41:21 2019 -0700
tree 20984f4c752e8b3d7cf192e71972699a453044fd
parent aea030f27615d3ba2c9305313b214975b4bb93c0
parent 50dc7e27c1b1aebb5a00a100bc1773244863f0d1

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7958033910
am: 50dc7e27c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I0edaafa2f226724cf90fac3dccbbb31f334f766b

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 77430e1..d0334f6 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 04783a8..d4f48e8 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -119,8 +119,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 3d85968..f4754cd 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>