commit 464cf233825518a56d934c3db72c3a3654fb44ce
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 07 00:46:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 07 00:46:54 2020 +0000
tree 3afa74250707e4509dd92b61982ef9f94283f8fa
parent b1ec15a4a89d4c7ee85c57950609a6939fd34c4e
parent f8ca862c098980a551a16ea9697e8b33c66d514d

Merge "Remove old vndk logic" am: 560c50f6cd am: f8ca862c09

Change-Id: Ie650bbb9379722770f4031f58bab68bc37b450b7

device-common.mk

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 \

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 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>