diff options
| -rw-r--r-- | DEPS | 45 | ||||
| -rwxr-xr-x | build/gyp_chromium | 5 |
2 files changed, 3 insertions, 47 deletions
@@ -666,51 +666,6 @@ hooks = [ "-s", "src/third_party/WebKit", "-o", "src/build/util/LASTCHANGE.blink"], }, - # Pull GN binaries. This needs to be before running GYP below. - { - "name": "gn_win", - "pattern": "src/tools/gn/bin/win/gn.exe.sha1", - "action": [ "download_from_google_storage", - "--no_resume", - "--platform=win32", - "--no_auth", - "--bucket", "chromium-gn", - "-s", "src/tools/gn/bin/win/gn.exe.sha1", - ], - }, - { - "name": "gn_mac", - "pattern": "src/tools/gn/bin/mac/gn.sha1", - "action": [ "download_from_google_storage", - "--no_resume", - "--platform=darwin", - "--no_auth", - "--bucket", "chromium-gn", - "-s", "src/tools/gn/bin/mac/gn.sha1", - ], - }, - { - "name": "gn_linux", - "pattern": "src/tools/gn/bin/linux/gn.sha1", - "action": [ "download_from_google_storage", - "--no_resume", - "--platform=linux*", - "--no_auth", - "--bucket", "chromium-gn", - "-s", "src/tools/gn/bin/linux/gn.sha1", - ], - }, - { - "name": "gn_linux32", - "pattern": "src/tools/gn/bin/linux/gn32.sha1", - "action": [ "download_from_google_storage", - "--no_resume", - "--platform=linux*", - "--no_auth", - "--bucket", "chromium-gn", - "-s", "src/tools/gn/bin/linux/gn32.sha1", - ], - }, # Pull clang-format binaries using checked-in hashes. { "name": "clang_format_win", diff --git a/build/gyp_chromium b/build/gyp_chromium index b06552d..63e8671 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -550,8 +550,9 @@ if __name__ == '__main__': 'GYP_CROSSCOMPILE' not in os.environ)): os.environ['GYP_CROSSCOMPILE'] = '1' - if not RunGN(gn_vars_dict): - sys.exit(1) + # TODO(brettw) bug 350974 either turn back on GN or delete all of this code. + #if not RunGN(gn_vars_dict): + # sys.exit(1) args.extend( ['-I' + i for i in additional_include_files(supplemental_includes, args)]) |