Selective build clobbering feature (landmines.py and android build scripts).

build/android/buildbot/buildbot_functions.sh

Index: build/android/buildbot/buildbot_functions.sh
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index 9fdd137053c23c235d5685e548ca6dda31a0a536..2d6e585b1533a0bab8995dbb6eed9ca89f62e489 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -47,18 +47,6 @@ function bb_baseline_setup {
   shift
   cd $SRC_ROOT
 
-  if [[ $BUILDBOT_CLOBBER ]]; then
-    echo "@@@BUILD_STEP Clobber@@@"
-    # Sdk key expires, delete android folder.
-    # crbug.com/145860
-    rm -rf ~/.android
-    rm -rf "${SRC_ROOT}"/out
-    if [ -e "${SRC_ROOT}"/out ] ; then
-      echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
-      echo "@@@STEP_WARNINGS@@@"
-    fi
-  fi
-
   echo "@@@BUILD_STEP Environment setup@@@"
   bb_parse_args "$@"
 
@@ -68,17 +56,44 @@ function bb_baseline_setup {
   fi
   export GOMA_DIR=/b/build/goma
   . build/android/envsetup.sh
-  adb kill-server
-  adb start-server
-}
 
-function bb_compile_setup {
   local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
      extra_gyp_defines)"
   export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
   if echo $extra_gyp_defines | grep -q clang; then
     unset CXX_target
   fi
+
+  local out_path="${SRC_ROOT}/out/${BUILDTYPE}"

[Isaac (away), 2012/10/24 04:54:07]

let's move this to where it is used.  Let's call it build_path.

[iannucci, 2012/10/24 21:40:08]

Done.

+  local trigger_path="$out_path/.landmines_triggered"

[Isaac (away), 2012/10/24 04:54:07]

how about landmine_file_path ?

[iannucci, 2012/10/24 21:40:08]

I went for an even more bland name :)

+  adb kill-server
+  adb start-server
+
+  python "$SRC_ROOT/build/landmines.py"
+
+  if [[ $BUILDBOT_CLOBBER || -f "$trigger_path" ]]; then
+    echo "@@@BUILD_STEP Clobber@@@"
+
+    if [[ -f "$trigger_path" ]]; then

[Isaac (away), 2012/10/24 19:23:29]

This should check [[ -z $BUILDBOT_CLOBBER ]] instead of checking if trigger_path
is set so if both conditions are met it runs the find command.

[iannucci, 2012/10/24 21:40:08]

Makes sense. Done.

+      echo "Clobbering due to triggered landmines: "
+      cat "$trigger_path"
+    else
+      # Also remove all the files under out/ on an explicit clobber
+      find "${SRC_ROOT}/out" -maxdepth 1 -type f -exec rm \{\} \+

[Isaac (away), 2012/10/24 04:54:07]

find "${SRC_ROOT}/out" -maxdepth 1 -type f -exec rm -f {} \;

[iannucci, 2012/10/24 21:40:08]

-f is good.

I vastly prefer +, unless you feel strongly about invoking rm once per file
instead of passing it all the files to delete?

+    fi
+
+    # Sdk key expires, delete android folder.
+    # crbug.com/145860
+    rm -rf ~/.android
+    rm -rf "$out_path"
+    if [ -e "$out_path" ] ; then

[Isaac (away), 2012/10/24 04:54:07]

switch this to [[ -e $out_path ]]  (quotes around variables are not needed for
double bracket tests)

[iannucci, 2012/10/24 21:40:08]

Done.

+      echo "Clobber appeared to fail?  $out_path still exists."
+      echo "@@@STEP_WARNINGS@@@"
+    fi
+  fi
+}
+
+function bb_compile_setup {
   bb_setup_goma_internal
   # Should be called only after envsetup is done.
   gclient runhooks