commit b6cadcf1fb57341d68569b926d75f03b61cb752a
author Xin Li <delphij@google.com> Thu Sep 05 12:09:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 05 12:09:21 2019 -0700
tree 58b02075506d476a9f29fd96a634436f89ba0cd6
parent 9e213dd0ddbd2e9ca8faf538a09f54609ddbd686
parent dce53bbe7521d02b5eb34160aa87eebd8022f8e1

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: df7e1b6c4c -s ours am: 4196fb9b98 am: 552d54fcec
am: dce53bbe75 -s ours
am skip reason: subject contains skip directive

Change-Id: I96e119c39b6abaceead45e04c620c8545f283dc3

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 3bd5912..0d7b2b5 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