summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 21:54:28 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 21:54:28 +0000
commited321c69d78b48bcd51c4b883c1e2a69832664a6 (patch)
tree31af7618a84e0cea490ada043664f231a6188a41 /chrome
parent4e1c6cfe7aa7a281f6f6ce5006bef6ade08dc685 (diff)
downloadchromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.zip
chromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.tar.gz
chromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.tar.bz2
Base: Adjust dependencies to build with base.dll
BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6894040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp3
-rw-r--r--chrome/chrome_installer.gypi1
-rw-r--r--chrome/chrome_tests.gypi1
-rw-r--r--chrome/installer/installer_tools.gyp5
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7093875..5dca742 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1154,6 +1154,9 @@
'include_dirs': [
'..',
],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
'sources': [
'tools/convert_dict/aff_reader.cc',
'tools/convert_dict/aff_reader.h',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 4d0dd79..ccf96ca 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -196,6 +196,7 @@
'dependencies': [
'installer_util',
'installer_util_strings',
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/build/util/build_util.gyp:lastchange',
'<(DEPTH)/build/util/support/support.gyp:*',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a2f5529..4b6c111 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -870,6 +870,7 @@
'msvs_guid': '3F9C9B6D-BBB6-480F-B038-23BF35A432DC',
'dependencies': [
'chromedriver_lib',
+ '../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp
index 1f7474b..989b6ba 100644
--- a/chrome/installer/installer_tools.gyp
+++ b/chrome/installer/installer_tools.gyp
@@ -1,3 +1,7 @@
+# Copyright (c) 2011 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.
+
{
'variables': {
'version_py': '<(DEPTH)/chrome/tools/build/version.py',
@@ -15,6 +19,7 @@
'msvs_guid': '7CC08DA8-E9CA-4573-A8C4-E7F0D0CF8EBA',
'type': 'executable',
'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/chrome/chrome.gyp:common_constants',
'<(DEPTH)/chrome/chrome.gyp:installer_util',
'<(DEPTH)/chrome/chrome.gyp:installer_util_strings',