commit 4a2f1733396e568aae068f8d36feba41a35375b3
author Ying Wang <wangying@google.com> Wed Feb 13 11:50:02 2013 -0800
committer Ying Wang <wangying@google.com> Wed Feb 13 11:57:45 2013 -0800
tree fd6bc3b590370bbc87d7b7536b15ee599d94c183
parent cd33a7c8f162e530ba1bcac2d450ca8eef9f7b78

Dont' write out the clean_steps.mk if

If this is mm/mmm and there is no pre-existing clean_steps.mk.
Otherwise, the build system will run almost all the clean steps in the
sourcet tree if you do a full build next.

Change-Id: I5fe1e99c4f09629e4455319ea664cfba4ac634ea

core/cleanbuild.mk

diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk
index c17902d..b6b95af 100644
--- a/core/cleanbuild.mk
+++ b/core/cleanbuild.mk
@@ -88,7 +88,8 @@
 CURRENT_CLEAN_STEPS :=
 
 # Write the new state to the file.
-#
+# Don't write the file if we are running mm/mmm but without a preexisting clean_steps_file.
+ifneq (,$(wildcard $(clean_steps_file))$(filter ||,|$(ONE_SHOT_MAKEFILE)|))
 $(shell \
   mkdir -p $(dir $(clean_steps_file)) && \
   echo "CURRENT_CLEAN_BUILD_VERSION := $(INTERNAL_CLEAN_BUILD_VERSION)" > \
@@ -96,6 +97,7 @@
   echo "CURRENT_CLEAN_STEPS := $(INTERNAL_CLEAN_STEPS)" >> \
       $(clean_steps_file) \
  )
+endif
 
 clean_steps_file :=
 INTERNAL_CLEAN_STEPS :=