From: Mike Lockwood <lockwood@android.com>
Date: Mon, 7 Dec 2009 15:52:22 +0000 (-0500)
Subject: resolved conflicts for merge of 882ad42e to eclair-mr2
X-Git-Tag: android-x86-2.2~259^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=623a5572;p=android-x86%2Fbuild.git

resolved conflicts for merge of 882ad42e to eclair-mr2

Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
---

623a5572e894c2114767f5631165354076d0b139
diff --cc cleanspec.mk
index 02c36d1e3,4b888689a..5674df053
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@@ -117,13 -105,8 +117,14 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  $(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 $(PRODUCT_OUT)/system/build.prop)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleSubscribedFeedsProvider.apk)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +$(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