resolve merge conflicts of 79805876080859d9ca6b15fe2a811b54c18789f8 to qt-r1-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2acc079286697d8a303d15283fcde9af4c6cd69b
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b0dbb04..fca07fd 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -638,6 +638,10 @@
$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libc_malloc*)
+
+# Clean up old location of soft OMX plugins
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************