diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:17:33 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:17:33 +0000 |
| commit | fcaa54ac4e3be4b65e99526686c003574735d6c6 (patch) | |
| tree | d2957113095917d48fb928ad78f8fe3f98775536 | |
| parent | aa033af5a4a6415200781d0704a36fe724ecd803 (diff) | |
| download | chromium_src-fcaa54ac4e3be4b65e99526686c003574735d6c6.zip chromium_src-fcaa54ac4e3be4b65e99526686c003574735d6c6.tar.gz chromium_src-fcaa54ac4e3be4b65e99526686c003574735d6c6.tar.bz2 | |
Switched dynamic_annotations.gyp from using the DEPTH attribute to a relative directory.
The DEPTH attribute works fine as long as you're building the base library from the chrome src
directory (which the vast majority of people do). If, however, you're trying to build it as a dependency
in another project (as I am for the webtest-plugin project), the DEPTH attribute does not work.
The relative path builds correctly in both situations.
Review URL: http://codereview.chromium.org/2868068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53809 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/third_party/dynamic_annotations/dynamic_annotations.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.gyp b/base/third_party/dynamic_annotations/dynamic_annotations.gyp index 0cb4627..d1fa819 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.gyp +++ b/base/third_party/dynamic_annotations/dynamic_annotations.gyp @@ -9,7 +9,7 @@ 'type': '<(library)', 'msvs_guid': 'EF3AD1A1-5FA6-4B70-9CCC-F5AE4C6D0892', 'include_dirs': [ - '<(DEPTH)', + '../../../', ], 'sources': [ 'dynamic_annotations.c', @@ -29,7 +29,7 @@ # TODO(gregoryd): merge with dynamic_annotations when # the win32/64 targets are merged. 'include_dirs': [ - '<(DEPTH)', + '../../../', ], 'sources': [ 'dynamic_annotations.c', |