add rmt_storage to "shutdown critical" am: e5fd979cce
am: fc01b8a6d0
Change-Id: Ia6291d44b9d25ea7c094150febaae9aa55174e4d
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 13b7e2a..cf55989 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -77,3 +77,5 @@
$(call add-clean-step, find $(OUT_DIR)/target/product/bullhead/ -name \*build.prop* -exec rm -rf {} \;)
$(call add-clean-step, find $(OUT_DIR)/target/product/bullhead/ -name \*build.prop* -exec rm -rf {} \;)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/permissions/android.hardware.wifi.aware.xml)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/hw/android.hardware.broadcastradio@1.0-impl.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/hw/android.hardware.broadcastradio@1.0-impl.so)
diff --git a/device.mk b/device.mk
index c42ed2b..2609180 100644
--- a/device.mk
+++ b/device.mk
@@ -238,7 +238,6 @@
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-impl \
android.hardware.audio.effect@2.0-impl \
- android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl
PRODUCT_PACKAGES += \
@@ -579,17 +578,6 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.product.first_api_level=23
-# In userdebug, add minidebug info the the boot image and the system server to support
-# diagnosing native crashes.
-ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT)))
- # Boot image.
- PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
- # System server and some of its services.
- # Note: we cannot use PRODUCT_SYSTEM_SERVER_JARS, as it has not been expanded at this point.
- $(call add-product-dex-preopt-module-config,services,--generate-mini-debug-info)
- $(call add-product-dex-preopt-module-config,wifi-service,--generate-mini-debug-info)
-endif
-
# setup dalvik vm configs.
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
