Merge branch 'master' into froyo-release

This commit is contained in:
The Android Automerger 2010-03-08 09:16:08 -08:00
commit 9b4fd7213e
1 changed files with 4 additions and 0 deletions

View File

@ -174,6 +174,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/soundback.apk)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/talkback.apk)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Launcher*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher*.apk)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Music*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/jsr305_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/guava_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST