summaryrefslogtreecommitdiffstats
path: root/base/third_party
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 08:33:37 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 08:33:37 +0000
commitb4a0b99952799664ef87897352082579181326b1 (patch)
treec79bdb5b992e251f7acee3939f46d67f37b685b2 /base/third_party
parent8eb06a210848d2de7bc13ba639e2d38ef904f6b8 (diff)
downloadchromium_src-b4a0b99952799664ef87897352082579181326b1.zip
chromium_src-b4a0b99952799664ef87897352082579181326b1.tar.gz
chromium_src-b4a0b99952799664ef87897352082579181326b1.tar.bz2
Move dynamic_annotations into a separate gyp file to break
a circular gyp dependency between allocator.gyp and base.gyp. BUG=44538 Review URL: http://codereview.chromium.org/2108016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
-rw-r--r--base/third_party/dynamic_annotations/dynamic_annotations.gyp47
1 files changed, 47 insertions, 0 deletions
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.gyp b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
new file mode 100644
index 0000000..0cb4627
--- /dev/null
+++ b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
@@ -0,0 +1,47 @@
+# 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.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'dynamic_annotations',
+ 'type': '<(library)',
+ 'msvs_guid': 'EF3AD1A1-5FA6-4B70-9CCC-F5AE4C6D0892',
+ 'include_dirs': [
+ '<(DEPTH)',
+ ],
+ 'sources': [
+ 'dynamic_annotations.c',
+ 'dynamic_annotations.h',
+ ],
+ },
+ ],
+ 'conditions': [
+ ['OS == "win"', {
+ 'targets': [
+ {
+ 'target_name': 'dynamic_annotations_win64',
+ 'type': '<(library)',
+ 'msvs_guid': 'E8055455-0065-427B-9461-34A16FAD1973',
+ # We can't use dynamic_annotations target for win64 build since it is
+ # a 32-bit library.
+ # TODO(gregoryd): merge with dynamic_annotations when
+ # the win32/64 targets are merged.
+ 'include_dirs': [
+ '<(DEPTH)',
+ ],
+ 'sources': [
+ 'dynamic_annotations.c',
+ 'dynamic_annotations.h',
+ ],
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_target_platform': 'x64',
+ },
+ },
+ },
+ ],
+ }],
+ ],
+}