am b1665953: am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2

Merge commit 'b16659533e55476bbe2c0b177943ef8f4129e34a'

* commit 'b16659533e55476bbe2c0b177943ef8f4129e34a':
  Add clean step for switching GPS API from pdapi to loc_api
This commit is contained in:
Mike Lockwood 2009-12-07 18:32:14 -08:00 committed by Android Git Automerger
commit c7b8601d49
1 changed files with 1 additions and 0 deletions

View File

@ -127,6 +127,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST