diff options
| -rw-r--r-- | base/base.gypi | 9 | ||||
| -rw-r--r-- | crypto/crypto.gyp | 8 | ||||
| -rw-r--r-- | net/net.gyp | 8 | ||||
| -rw-r--r-- | ui/ui.gyp | 16 |
4 files changed, 13 insertions, 28 deletions
diff --git a/base/base.gypi b/base/base.gypi index 8c7945a..2c789bf0 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -353,6 +353,9 @@ 'win/wrapped_window_proc.cc', 'win/wrapped_window_proc.h', ], + 'defines': [ + 'BASE_IMPLEMENTATION', + ], 'include_dirs': [ '..', ], @@ -534,9 +537,6 @@ ], },], [ 'component=="shared_library"', { - 'defines': [ - 'BASE_IMPLEMENTATION', - ], 'conditions': [ ['OS=="win"', { 'sources!': [ @@ -621,9 +621,6 @@ }, 'conditions': [ [ 'component == "shared_library"', { - 'defines': [ - 'BASE_IMPLEMENTATION', - ], 'sources!': [ 'debug/debug_on_start_win.cc', ], diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index f660e4cd..b073a99 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -15,6 +15,9 @@ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], + 'defines': [ + 'CRYPTO_IMPLEMENTATION', + ], 'msvs_disabled_warnings': [ 4018, ], @@ -74,11 +77,6 @@ 'capi_util.cc', ], }], - [ 'component == "shared_library"', { - 'defines': [ - 'CRYPTO_IMPLEMENTATION', - ], - }], [ 'use_openssl==1', { # TODO(joth): Use a glob to match exclude patterns once the # OpenSSL file set is complete. diff --git a/net/net.gyp b/net/net.gyp index 724e24b..f83cc76 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -666,6 +666,9 @@ 'websockets/websocket_throttle.cc', 'websockets/websocket_throttle.h', ], + 'defines': [ + 'NET_IMPLEMENTATION', + ], 'export_dependent_settings': [ '../base/base.gyp:base', ], @@ -822,11 +825,6 @@ ], }, ], - [ 'component == "shared_library"', { - 'defines': [ - 'NET_IMPLEMENTATION', - ], - }], [ 'OS == "mac"', { 'dependencies': [ '../third_party/nss/nss.gyp:nspr', @@ -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', - ], - }], - ], }, ], }], |