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

It looks like this made win extract_build fail.

Adds the ability for devs/troopers/etc. to set 'landmines' in the tree so that
the build will selectively clobber when a builder moves over a revision with such
a change.

This cl has an basis landmines.py, and hooks the clobber mechanism to the android
build scripts. 

The relevant cl which implements this for
compile.py is here: https://chromiumcodereview.appspot.com/11234013/

I'm planning to also implement an informational invocation for gclient to let devs know
about any potential landmines so they can decide if they need to clobber.

R=cmp,maruel@chromium.org
BUG=121897

Review URL: https://chromiumcodereview.appspot.com/11175016

TBR=iannucci@chromium.org
Review URL: https://codereview.chromium.org/11293111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166105 0039d316-1c4b-4281-b951-d872f2087c98

Author: vandebo@chromium.org

DEPS

@@ -631,9 +631,4 @@ hooks = [
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
-  {
-    # Check for landmines (reasons to clobber the build).
-    "pattern": ".",
-    "action": ["python", "src/build/landmines.py"],
-  },
 ]

build/android/buildbot/buildbot_functions.sh

@@ -47,6 +47,18 @@ 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 "$@"
 
@@ -56,44 +68,17 @@ 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
-
-  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

build/gyp_chromium

@@ -8,7 +8,6 @@
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
-import gyp_helper
 import os
 import shlex
 import subprocess
@@ -45,6 +44,36 @@ if sys.platform == 'win32':
 else:
   psyco = None
 
+def apply_gyp_environment(file_path=None):
+  """
+  Reads in a *.gyp_env file and applies the valid keys to os.environ.
+  """
+  if not file_path or not os.path.exists(file_path):
+    return
+  file_contents = open(file_path).read()
+  try:
+    file_data = eval(file_contents, {'__builtins__': None}, None)
+  except SyntaxError, e:
+    e.filename = os.path.abspath(file_path)
+    raise
+  supported_vars = ( 'CC',
+                     'CHROMIUM_GYP_FILE',
+                     'CHROMIUM_GYP_SYNTAX_CHECK',
+                     'CXX',
+                     'GYP_DEFINES',
+                     'GYP_GENERATOR_FLAGS',
+                     'GYP_GENERATOR_OUTPUT',
+                     'GYP_GENERATORS', )
+  for var in supported_vars:
+    val = file_data.get(var)
+    if val:
+      if var in os.environ:
+        print 'INFO: Environment value for "%s" overrides value in %s.' % (
+            var, os.path.abspath(file_path)
+        )
+      else:
+        os.environ[var] = val
+
 def additional_include_files(args=[]):
   """
   Returns a list of additional (.gypi) files to include, without
@@ -95,7 +124,10 @@ if __name__ == '__main__':
     p.communicate()
     sys.exit(p.returncode)
 
-  gyp_helper.apply_chromium_gyp_env()
+  if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:
+    # Update the environment based on chromium.gyp_env
+    gyp_env_path = os.path.join(os.path.dirname(chrome_src), 'chromium.gyp_env')
+    apply_gyp_environment(gyp_env_path)
 
   # This could give false positives since it doesn't actually do real option
   # parsing.  Oh well.