diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 08:33:37 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 08:33:37 +0000 |
| commit | b4a0b99952799664ef87897352082579181326b1 (patch) | |
| tree | c79bdb5b992e251f7acee3939f46d67f37b685b2 /base/base.gypi | |
| parent | 8eb06a210848d2de7bc13ba639e2d38ef904f6b8 (diff) | |
| download | chromium_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/base.gypi')
| -rw-r--r-- | base/base.gypi | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/base/base.gypi b/base/base.gypi index ec5cb4d..5970833 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -371,7 +371,7 @@ }, 'dependencies': [ '../third_party/modp_b64/modp_b64.gyp:modp_b64', - 'dynamic_annotations', + '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 @@ -574,44 +574,11 @@ 'version.h', ], }, - { - 'target_name': 'dynamic_annotations', - 'type': '<(library)', - 'msvs_guid': 'EF3AD1A1-5FA6-4B70-9CCC-F5AE4C6D0892', - 'include_dirs': [ - '..', - ], - 'sources': [ - 'third_party/dynamic_annotations/dynamic_annotations.c', - 'third_party/dynamic_annotations/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': [ - '..', - ], - 'sources': [ - 'third_party/dynamic_annotations/dynamic_annotations.c', - 'third_party/dynamic_annotations/dynamic_annotations.h', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - { 'target_name': 'base_nacl_win64', 'type': '<(library)', 'msvs_guid': 'CEE1F794-DC70-4FED-B7C4-4C12986672FE', @@ -619,7 +586,7 @@ 'base_target': 1, }, 'dependencies': [ - 'dynamic_annotations_win64', + 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', ], # TODO(gregoryd): direct_dependent_settings should be shared with the # 32-bit target, but it doesn't work due to a bug in gyp |