diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-01 10:40:03 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-01 10:40:03 +0000 |
| commit | 38d4ad7cd0a6045ed5eeb3964b06fafa71e8090f (patch) | |
| tree | a530d26479f729e27dcd74263ad72fb4a2b65cea /build | |
| parent | 7830689de5893b02152ab479693c5ce5b1de338f (diff) | |
| download | webrtc-38d4ad7cd0a6045ed5eeb3964b06fafa71e8090f.tar.gz | |
Roll chromium_revision 255773:260462
This disables GN use for the moment (Chromium
has disabled it for now but plan to pick up the
work at a later stage). I'm leaving the rest of
the GN stuff in our DEPS since that's how
the Chromium DEPS currently looks like.
Overview of changes in Chrome DEPS:
$ svn diff http://src.chromium.org/chrome/trunk/src/DEPS -r 255773:260462
which can be compared with the output of:
$ svn cat http://webrtc.googlecode.com/svn/trunk/DEPS | grep chromium_deps | sed 's/^ *//' | sort | uniq
in a WebRTC checkout, gives the following relevant changes:
* third_party/android_tools 0582bd:ca3567
* third_party/icu 249466:259309
* third_party/libjpeg_turbo 251747:259851
* third_party/libyuv 979:986
* third_party/nss 254867:259440
* tools/gyp 1860:1880
The following also shows that Clang is upgraded from r198389 to r202554:
$ svn diff http://src.chromium.org/chrome/trunk/src/tools/clang/scripts/update.sh -r 255773:260462
TEST=trybots
BUG=None
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/10679004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5822 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
| -rwxr-xr-x | build/gyp_webrtc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/build/gyp_webrtc b/build/gyp_webrtc index 7191c310..9ac4c141 100755 --- a/build/gyp_webrtc +++ b/build/gyp_webrtc @@ -23,6 +23,7 @@ sys.path.insert(0, os.path.join(checkout_root, 'build')) sys.path.insert(0, os.path.join(checkout_root, 'tools', 'find_depot_tools')) import gyp_chromium import gyp_helper +import vs_toolchain sys.path.insert(0, os.path.join(checkout_root, 'tools', 'gyp', 'pylib')) import gyp @@ -60,13 +61,13 @@ if __name__ == '__main__': if not os.environ.get('GYP_GENERATORS'): os.environ['GYP_GENERATORS'] = 'ninja' - vs2013_runtime_dll_dirs = gyp_chromium.DownloadVsToolChain() + vs2013_runtime_dll_dirs = vs_toolchain.DownloadVsToolchain() # Enforce gyp syntax checking. This adds about 20% execution time. args.append('--check') supplemental_includes = gyp_chromium.GetSupplementalFiles() - gn_vars_dict = gyp_chromium.GetGypVarsForGN(supplemental_includes) + gn_vars_dict = gyp_chromium.GetGypVars(supplemental_includes) # Automatically turn on crosscompile support for platforms that need it. if all(('ninja' in os.environ.get('GYP_GENERATORS', ''), @@ -74,8 +75,6 @@ if __name__ == '__main__': 'GYP_CROSSCOMPILE' not in os.environ)): os.environ['GYP_CROSSCOMPILE'] = '1' - if not gyp_chromium.RunGN(gn_vars_dict): - sys.exit(1) args.extend(['-I' + i for i in gyp_chromium.additional_include_files(supplemental_includes, args)]) @@ -91,7 +90,7 @@ if __name__ == '__main__': if vs2013_runtime_dll_dirs: x64_runtime, x86_runtime = vs2013_runtime_dll_dirs - gyp_chromium.CopyVsRuntimeDlls( + vs_toolchain.CopyVsRuntimeDlls( os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()), (x86_runtime, x64_runtime)) |