summaryrefslogtreecommitdiffstats
path: root/build/gyp_environment.py
diff options
context:
space:
mode:
authoriannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 02:07:35 +0000
committeriannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 02:08:38 +0000
commit5a9e71778a0357194e33d27c9802a6979dddbe4d (patch)
tree82cd3541c6494db1278bb1473439eb11d845d17b /build/gyp_environment.py
parent02a7f63626a073fb9018f0cd4126df3fcfba0fd3 (diff)
downloadchromium_src-5a9e71778a0357194e33d27c9802a6979dddbe4d.zip
chromium_src-5a9e71778a0357194e33d27c9802a6979dddbe4d.tar.gz
chromium_src-5a9e71778a0357194e33d27c9802a6979dddbe4d.tar.bz2
Revert of Make landmines work on local builds too (patchset #3 of https://codereview.chromium.org/457003004/)
Reason for revert: Apparently this requires win_toolchain.json to exist, but I'm not sure how it's supposed to get there (as seen on a clobber build): Traceback (most recent call last): File "src/build/landmines.py", line 132, in <module> sys.exit(main()) File "src/build/landmines.py", line 119, in main gyp_environment.SetEnvironment() File "C:\b\build\slave\win_trunk\build\src\build\gyp_environment.py", line 33, in SetEnvironment vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() File "C:\b\build\slave\win_trunk\build\src\build\vs_toolchain.py", line 33, in SetEnvironmentAndGetRuntimeDllDirs with open(json_data_file, 'r') as tempf: IOError: [Errno 2] No such file or directory: 'C:\\b\\build\\slave\\win_trunk\\build\\src\\build\\win_toolchain.json' Original issue's description: > Make landmines work on local builds too > > Moves (some of) gyp environment setup out of gyp_chromium into separate > module, and shares that between gyp_chromium and landmines.py. > > landmines.py is added as the first entry in DEPS hooks so that it can > clobber the entire build directory before running other hooks that > extract/generate into the build dir. > > R=iannucci@chromium.org > BUG=400011 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289099 TBR=scottmg@chromium.org NOTREECHECKS=true NOTRY=true BUG=400011 Review URL: https://codereview.chromium.org/469623002 Cr-Commit-Position: refs/heads/master@{#289158} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_environment.py')
-rw-r--r--build/gyp_environment.py33
1 files changed, 0 insertions, 33 deletions
diff --git a/build/gyp_environment.py b/build/gyp_environment.py
deleted file mode 100644
index fb50645..0000000
--- a/build/gyp_environment.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2014 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.
-
-"""
-Sets up various automatic gyp environment variables. These are used by
-gyp_chromium and landmines.py which run at different stages of runhooks. To
-make sure settings are consistent between them, all setup should happen here.
-"""
-
-import gyp_helper
-import os
-import sys
-import vs_toolchain
-
-def SetEnvironment():
- """Sets defaults for GYP_* variables."""
- gyp_helper.apply_chromium_gyp_env()
-
- # Default to ninja on linux and windows, but only if no generator has
- # explicitly been set.
- # Also default to ninja on mac, but only when not building chrome/ios.
- # . -f / --format has precedence over the env var, no need to check for it
- # . set the env var only if it hasn't been set yet
- # . chromium.gyp_env has been applied to os.environ at this point already
- if sys.platform.startswith(('linux', 'win', 'freebsd')) and \
- not os.environ.get('GYP_GENERATORS'):
- os.environ['GYP_GENERATORS'] = 'ninja'
- elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \
- not 'OS=ios' in os.environ.get('GYP_DEFINES', []):
- os.environ['GYP_GENERATORS'] = 'ninja'
-
- vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()