resolve merge conflicts of 07d4342fa57369256ccf24e45264284cb6f0d40d to qt-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iba2e59906c6d9dd3dba2cf3ebe88206ae9d7bca9
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
# ************************************************