resolved conflicts for merge of f739e31 to master

Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
xeonchen · Aug 30, 2010 · 36aa8c3 · 36aa8c3
2 parents ec9553f + f739e31
commit 36aa8c3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -48,6 +48,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmediaplayerservice_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmedia_jni_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************