summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/app_base.gypi5
-rw-r--r--base/base.gypi3
-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
-rw-r--r--chrome_frame/chrome_frame.gyp8
-rw-r--r--chrome_frame/crash_reporting/crash_reporting.gyp5
-rw-r--r--content/content_common.gypi4
-rw-r--r--gpu/gpu.gyp7
-rw-r--r--media/media.gyp2
-rw-r--r--ppapi/ppapi_shared_proxy.gypi5
-rw-r--r--remoting/remoting.gyp5
-rw-r--r--sandbox/sandbox.gyp3
-rw-r--r--views/views.gyp1
-rw-r--r--webkit/support/webkit_support.gypi7
-rw-r--r--webkit/tools/test_shell/test_shell.gypi3
17 files changed, 63 insertions, 5 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index db8cceb..873cbb0 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -62,6 +62,7 @@
# target, but it doesn't work due to a bug in gyp
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:base_static',
'../ui/ui.gyp:ui_gfx',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -73,6 +74,10 @@
'../ui/base/strings/ui_strings.gyp:ui_strings',
'<(libjpeg_gyp_path):libjpeg',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_static',
+ ],
# TODO(gregoryd): The direct_dependent_settings should be shared with
# the 64-bit target, but it doesn't work due to a bug in gyp
'direct_dependent_settings': {
diff --git a/base/base.gypi b/base/base.gypi
index 5db404c..77678eb 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -432,6 +432,9 @@
'../third_party/modp_b64/modp_b64.gyp:modp_b64',
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
+ 'export_dependent_settings': [
+ 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ ],
# TODO(gregoryd): direct_dependent_settings should be shared with the
# 64-bit target, but it doesn't work due to a bug in gyp
'direct_dependent_settings': {
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',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 7674ed8..b454c51 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -849,7 +849,13 @@
'sync_msg_reply_dispatcher.cc',
'task_marshaller.h',
'task_marshaller.cc',
- ]
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
},
{
'target_name': 'npchrome_frame',
diff --git a/chrome_frame/crash_reporting/crash_reporting.gyp b/chrome_frame/crash_reporting/crash_reporting.gyp
index 2ec1eb0..2f631dc 100644
--- a/chrome_frame/crash_reporting/crash_reporting.gyp
+++ b/chrome_frame/crash_reporting/crash_reporting.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# 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.
@@ -26,6 +26,9 @@
'vectored_handler-impl.h',
'vectored_handler.h',
],
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ ],
'conditions': [
['OS=="win"', {
'dependencies': [
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ff1a7ae..fb41c84 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -8,6 +8,7 @@
'target_name': 'content_common',
'type': '<(library)',
'dependencies': [
+ '../base/base.gyp:base',
'../ipc/ipc.gyp:ipc',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
@@ -22,6 +23,9 @@
'include_dirs': [
'..',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
'sources': [
'common/appcache/appcache_backend_proxy.cc',
'common/appcache/appcache_backend_proxy.h',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 3915877..6a6f6ff 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -49,6 +49,12 @@
'.',
],
},
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
'sources': [
'command_buffer/common/bitfield_helpers.h',
'command_buffer/common/buffer.h',
@@ -375,6 +381,7 @@
'dependencies': [
'command_buffer_client',
'gles2_c_lib',
+ '../base/base.gyp:base',
],
'include_dirs': [
'..',
diff --git a/media/media.gyp b/media/media.gyp
index 60cffe2..31961e8 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -483,6 +483,7 @@
'type': 'executable',
'dependencies': [
'media',
+ '../base/base.gyp:base',
],
'sources': [
'tools/wav_ola_test/wav_ola_test.cc'
@@ -581,6 +582,7 @@
'type': 'executable',
'dependencies': [
'media',
+ '../base/base.gyp:base',
'../ui/gfx/gl/gl.gyp:gl',
],
'sources': [
diff --git a/ppapi/ppapi_shared_proxy.gypi b/ppapi/ppapi_shared_proxy.gypi
index 341e1f3..7c6ed6b 100644
--- a/ppapi/ppapi_shared_proxy.gypi
+++ b/ppapi/ppapi_shared_proxy.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
@@ -17,6 +17,9 @@
'include_dirs': [
'..',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
'sources': [
'shared_impl/audio_impl.cc',
'shared_impl/audio_impl.h',
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 47fb8bd..b349603 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
@@ -114,6 +114,7 @@
'target_name': 'chromoting_base',
'type': '<(library)',
'dependencies': [
+ '../base/base.gyp:base',
'../ui/ui.gyp:ui_gfx',
'../media/media.gyp:media',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
@@ -126,6 +127,7 @@
#'third_party/on2/on2.gyp:vp8',
],
'export_dependent_settings': [
+ '../base/base.gyp:base',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'proto/chromotocol.gyp:chromotocol_proto_lib',
],
@@ -331,6 +333,7 @@
'target_name': 'chromoting_jingle_glue',
'type': '<(library)',
'dependencies': [
+ '../base/base.gyp:base',
'../jingle/jingle.gyp:jingle_glue',
'../jingle/jingle.gyp:notifier',
'../third_party/libjingle/libjingle.gyp:libjingle',
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index e44e817..22d88ac 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -190,6 +190,9 @@
'../base/base.gyp:base',
'../base/base.gyp:base_static',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
'msvs_guid': '881F6A97-D539-4C48-B401-DF04385B2343',
'sources': [
# Files that are used by the 32-bit version of Windows sandbox only.
diff --git a/views/views.gyp b/views/views.gyp
index d797cd0..939ab40 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -64,6 +64,7 @@
'dependencies': [
'../app/app.gyp:app_base',
'../app/app.gyp:app_resources',
+ '../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index f86b821..bc46f95 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
@@ -11,6 +11,7 @@
'target_name': 'webkit_support',
'type': '<(library)',
'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/ui/ui.gyp:ui_gfx',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/skia/skia.gyp:skia',
@@ -73,10 +74,14 @@
'target_name': 'webkit_support_common',
'type': '<(library)',
'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/crypto/crypto.gyp:crypto',
'<(DEPTH)/skia/skia.gyp:skia',
'glue',
],
+ 'export_dependent_settings': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
'sources': [
'<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h',
'<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index d843493..bdbc356 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -526,6 +526,9 @@
'../../plugins/npapi/test/plugin_test.h',
'../../plugins/npapi/test/plugin_test_factory.h',
],
+ 'export_dependent_settings': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
},
{
'target_name': 'npapi_test_plugin',
generated by cgit v1.1 at 2024-10-30 05:10:09 +0000