commit f06675e2a47d0e9322f8a619e84f72882cec039d
author Joe Onorato <joeo@google.com> Fri Sep 03 10:36:46 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 03 10:36:46 2010 -0700
tree 459f197adaff79475a680c941f4a52f34b514e4c
parent 54b634dce81e65a1a76e9e9693aa93ed15eb42d1
parent 4b1e2245857d696aa0dfcd7a163c6d04025c74f6

am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
  The old clean target had bit rotted.

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 2bcd463..9f60d5a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -800,23 +800,13 @@
 findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)
 
 .PHONY: clean
-dirs_to_clean := \
-	$(PRODUCT_OUT) \
-	$(TARGET_COMMON_OUT_ROOT) \
-	$(HOST_OUT) \
-	$(HOST_COMMON_OUT_ROOT)
 clean:
-	@for dir in $(dirs_to_clean) ; do \
-	    echo "Cleaning $$dir..."; \
-	    rm -rf $$dir; \
-	done
-	@echo "Clean."; \
-
-.PHONY: clobber
-clobber:
 	@rm -rf $(OUT_DIR)
 	@echo "Entire build directory removed."
 
+.PHONY: clobber
+clobber: clean
+
 # The rules for dataclean and installclean are defined in cleanbuild.mk.
 
 #xxx scrape this from ALL_MODULE_NAME_TAGS