Commit 715d86f2 authored by Nico Weber's avatar Nico Weber

Roll GTM from svn r705 to git hash 4018783.

Also move it from the old google code mirror to the new github mirror.

BUG=550066
R=hans@chromium.org, stuartmorgan@chromium.org
TBR=stuartmorgan

Review URL: https://codereview.chromium.org/1432623002 .

Cr-Commit-Position: refs/heads/master@{#357691}
parent 03b4800d
...@@ -75,7 +75,7 @@ vars = { ...@@ -75,7 +75,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac # the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other. # and whatever else without interference from each other.
'google_toolbox_for_mac_revision': 'ce47a231ea0b238fbe95538e86cc61d74c234be6', # from svn revision 705 'google_toolbox_for_mac_revision': '401878398253074c515c03cb3a3f8bb0cc8da6e9',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lighttpd # the commit queue can handle CLs rolling lighttpd
# and whatever else without interference from each other. # and whatever else without interference from each other.
...@@ -339,7 +339,7 @@ deps_os = { ...@@ -339,7 +339,7 @@ deps_os = {
Var('chromium_git') + '/external/github.com/swisspol/GCDWebServer.git' + '@' + '3d5fd0b8281a7224c057deb2d17709b5bea64836', Var('chromium_git') + '/external/github.com/swisspol/GCDWebServer.git' + '@' + '3d5fd0b8281a7224c057deb2d17709b5bea64836',
'src/third_party/google_toolbox_for_mac/src': 'src/third_party/google_toolbox_for_mac/src':
Var('chromium_git') + '/external/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'), Var('chromium_git') + '/external/github.com/google/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'),
'src/third_party/nss': 'src/third_party/nss':
Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'), Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'),
...@@ -361,7 +361,7 @@ deps_os = { ...@@ -361,7 +361,7 @@ deps_os = {
Var('chromium_git') + '/chromium/reference_builds/chrome_mac.git' + '@' + '8dc181329e7c5255f83b4b85dc2f71498a237955', Var('chromium_git') + '/chromium/reference_builds/chrome_mac.git' + '@' + '8dc181329e7c5255f83b4b85dc2f71498a237955',
'src/third_party/google_toolbox_for_mac/src': 'src/third_party/google_toolbox_for_mac/src':
Var('chromium_git') + '/external/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'), Var('chromium_git') + '/external/github.com/google/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'),
'src/third_party/pdfsqueeze': 'src/third_party/pdfsqueeze':
......
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
'include_dirs': [ 'include_dirs': [
'../..', '../..',
], ],
'export_dependent_settings': [
'../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
],
}, },
{ {
# GN version: //ios/testing:ocmock_support_unittest # GN version: //ios/testing:ocmock_support_unittest
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment