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

build/android/buildbot/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 29 matching lines @@
 # Basic setup for all bots to run after a source tree checkout.
 # Args:
 #   $1: source root.
 #   $2 and beyond: key value pairs which are parsed by bb_parse_args.
 function bb_baseline_setup {
   SRC_ROOT="$1"
   # Remove SRC_ROOT param
   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 "$@"
 
   local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
   if [[ $BUILDTOOL = ninja ]]; then
     export GYP_GENERATORS=ninja
   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
-
-  adb kill-server
-  adb start-server
-
-  local build_path="${SRC_ROOT}/out/${BUILDTYPE}"
-  local landmines_triggered_path="$build_path/.landmines_triggered"
-  python "$SRC_ROOT/build/landmines.py"
-
-  if [[ $BUILDBOT_CLOBBER || -f "$landmines_triggered_path" ]]; then
-    echo "@@@BUILD_STEP Clobber@@@"
-
-    if [[ -z $BUILDBOT_CLOBBER ]]; then
-      echo "Clobbering due to triggered landmines: "
-      cat "$landmines_triggered_path"
-    else
-      # Also remove all the files under out/ on an explicit clobber
-      find "${SRC_ROOT}/out" -maxdepth 1 -type f -exec rm -f {} +
-    fi
-
-    # Sdk key expires, delete android folder.
-    # crbug.com/145860
-    rm -rf ~/.android
-    rm -rf "$build_path"
-    if [[ -e $build_path ]] ; then
-      echo "Clobber appeared to fail?  $build_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
 }
 
 # Setup goma.  Used internally to buildbot_functions.sh.
 function bb_setup_goma_internal {
   export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
   export GOMA_COMPILER_PROXY_DAEMON_MODE=true
   export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
@@ skipping 244 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP', '')"
 }