diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:24:42 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:24:42 +0000 |
| commit | ee857513c3a0d5c88bfd363c4203d4190fc678f5 (patch) | |
| tree | 8e4ce0e72ced6eacd5711375f0a0d6bbe48c59a3 /base/base.gypi | |
| parent | d4db59c55fdf97bf3abd60c58824fc090e0a7b61 (diff) | |
| download | chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.zip chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.gz chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.bz2 | |
Update dynamic annotations and move them to base/third_party
Review URL: http://codereview.chromium.org/1992005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/base/base.gypi b/base/base.gypi index ecec5cd..d529dab 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -64,8 +64,6 @@ 'dir_reader_fallback.h', 'dir_reader_linux.h', 'dir_reader_posix.h', - 'dynamic_annotations.h', - 'dynamic_annotations.cc', 'env_var.cc', 'env_var.h', 'event_trace_consumer_win.h', @@ -371,6 +369,7 @@ }, 'dependencies': [ '../third_party/modp_b64/modp_b64.gyp:modp_b64', + '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 @@ -573,17 +572,53 @@ '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', 'variables': { 'base_target': 1, }, + 'dependencies': [ + '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 'direct_dependent_settings': { |