summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_exe.gypi
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 06:19:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 06:19:06 +0000
commit12d4fdeb1135644471afd12f5a9f368fcfdcd74a (patch)
tree750c69dccd386924fa6160f378658bb03f657d52 /chrome/chrome_exe.gypi
parent7f88ee2ff55afc54409f2f91ba59eb620f4129a2 (diff)
downloadchromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.zip
chromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.tar.gz
chromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.tar.bz2
Revert previous incorrect change that tries to fix the nacl64 build failure.
Supply a dummy implementation of url_util::AddStandardScheme that will allow us to link a 64-bit library on an otherwise 32-bit OS. We don't otherwise need googleurl (or else it wouldn't link for other reasons) so we're guaranteed not calling AddStandardScheme is OK. BUG=none TEST=none Review URL: http://codereview.chromium.org/668222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r--chrome/chrome_exe.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index b274050..bdcd25f 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -503,7 +503,6 @@
'../breakpad/breakpad.gyp:breakpad_handler_win64',
'../breakpad/breakpad.gyp:breakpad_sender_win64',
'../base/base.gyp:base_nacl_win64',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
# TODO(gregoryd): build sandbox for 64 bit
# '../sandbox/sandbox.gyp:sandbox',