diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 18:38:24 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 18:38:24 +0000 |
| commit | 1dde29ee6927e9f9d19ca78515ede73614174415 (patch) | |
| tree | 3537432ea47b05285af574f21f936ba525f9f390 /ui | |
| parent | cfcada230f15529faa80fd58d7a2ba9910df7a55 (diff) | |
| download | chromium_src-1dde29ee6927e9f9d19ca78515ede73614174415.zip chromium_src-1dde29ee6927e9f9d19ca78515ede73614174415.tar.gz chromium_src-1dde29ee6927e9f9d19ca78515ede73614174415.tar.bz2 | |
Define FOO_IMPLEMENTATION unconditionally. Even though they only matter when
building component DLLs, it doesn't hurt to always define them, and it makes
the GYP files a bit simpler.
R=rvargas@chromium.org
Review URL: http://codereview.chromium.org/7457016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.gyp | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -47,6 +47,9 @@ 'gfx_resources', '<(libjpeg_gyp_path):libjpeg', ], + 'defines': [ + 'UI_IMPLEMENTATION', + ], # Export these dependencies since text_elider.h includes ICU headers. 'export_dependent_settings': [ '../net/net.gyp:net', @@ -358,11 +361,6 @@ ['exclude', '^base/win/*'], ], }], - ['component == "shared_library"', { - 'defines': [ - 'UI_IMPLEMENTATION', - ], - }], ['OS=="mac"', { 'link_settings': { 'libraries': [ @@ -464,6 +462,7 @@ '../base/base.gyp:base_nacl_win64', ], 'defines': [ + 'UI_IMPLEMENTATION', '<@(nacl_win64_defines)', ], 'sources': [ @@ -481,13 +480,6 @@ 'msvs_target_platform': 'x64', }, }, - 'conditions': [ - ['component=="shared_library"', { - 'defines': [ - 'UI_IMPLEMENTATION', - ], - }], - ], }, ], }], |