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

Merge commit '623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp

* commit '623a5572e894c2114767f5631165354076d0b139':
  Add clean step for switching GPS API from pdapi to loc_api
This commit is contained in:
Mike Lockwood 2009-12-07 08:09:53 -08:00 committed by Android Git Automerger
commit b16659533e

View file

@ -124,6 +124,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