summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome_dll.gypi1
-rw-r--r--chrome/chrome_exe.gypi1
-rw-r--r--chrome/common/googleurl_dummy.cc15
3 files changed, 16 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 7bd2163..b93c752 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -495,6 +495,7 @@
'app/chrome_dll_main.cc',
'app/chrome_dll_resource.h',
'browser/renderer_host/render_process_host_dummy.cc',
+ 'common/googleurl_dummy.cc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
# TODO: It would be nice to have these pulled in
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',
diff --git a/chrome/common/googleurl_dummy.cc b/chrome/common/googleurl_dummy.cc
new file mode 100644
index 0000000..475a5f1
--- /dev/null
+++ b/chrome/common/googleurl_dummy.cc
@@ -0,0 +1,15 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace url_util {
+
+// A dummy version of the url_util function called by url_constants.cc for all
+// process types. For some processes, we don't want to link against googleurl.
+// rather than having complicated versions of that library (32 and 64 bit ones
+// on Windows) we just instead link this file in cases where googleurl isn't
+// otherwise necessary.
+void AddStandardScheme(const char* new_scheme) {
+}
+
+} // namespace url_util