Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: trunk/src/build/gyp_chromium

Issue 79023008: Revert 236542 "Run GN as part of runhooks." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/gyp_chromium
===================================================================
--- trunk/src/build/gyp_chromium (revision 236542)
+++ trunk/src/build/gyp_chromium (working copy)
@@ -20,9 +20,6 @@
sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
import gyp
-# Assume this file is in a one-level-deep subdirectory of the source root.
-SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
# Add paths so that pymod_do_main(...) can import files.
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers'))
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
@@ -53,7 +50,6 @@
else:
psyco = None
-
def additional_include_files(args=[]):
"""
Returns a list of additional (.gypi) files to include, without
@@ -83,33 +79,6 @@
return result
-
-def RunGN():
- """Runs GN, returning True if it succeeded, printing an error and returning
- false if not."""
- # The binaries in platform-specific subdirectories in src/tools/gn/bin.
- gnpath = SRC_DIR + '/tools/gn/bin/'
- if sys.platform == 'win32':
- gnpath += 'win/gn.exe'
- elif sys.platform.startswith('linux'):
- gnpath += 'linux/gn'
- elif sys.platform == 'darwin':
- gnpath += 'mac/gn'
- else:
- print 'Unknown platform for GN: ', sys.platform
- return False
-
- print 'Generating gyp files from GN...'
- print 'platform = ', sys.platform
- print 'binary = ', gnpath
-
- # Need to pass both the source root (the bots don't run this command from
- # within the source tree) as well as set the is_gyp value so the BUILD files
- # to know they're being run under GYP.
- args = [gnpath, 'gyp', '-q', '--root=' + chrome_src, '--args=is_gyp=true']
- return subprocess.call(args) == 0
-
-
if __name__ == '__main__':
args = sys.argv[1:]
@@ -122,9 +91,6 @@
psyco.profile()
print "Enabled Psyco JIT."
- if not RunGN():
- sys.exit(1)
-
# Fall back on hermetic python if we happen to get run under cygwin.
# TODO(bradnelson): take this out once this issue is fixed:
# http://code.google.com/p/gyp/issues/detail?id=177
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698