diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-28 17:37:22 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-28 17:37:22 +0000 |
| commit | 296871bd3d804dfcd3c16c59a83fb173f6dfd438 (patch) | |
| tree | 1fa2acd112870a9b5584c691e20f7d8cbb3bba9a /base | |
| parent | 6f208360ab28a8fc8b948d6d537b6173399c45ef (diff) | |
| download | webrtc-296871bd3d804dfcd3c16c59a83fb173f6dfd438.tar.gz | |
GN: Add common configs to all targets.
This is needed to ensure we have the same build with GN
as with GYP, since GYP includes the common.gypi on a global level.
Several fixes has been needed in the past because some code have
been built without the right defines.
BUG=3441
R=brettw@chromium.org
Review URL: https://webrtc-codereview.appspot.com/28589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7317 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'base')
| -rw-r--r-- | base/BUILD.gn | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 0de5ea46..3be8a3ae 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -82,7 +82,7 @@ if (is_linux && !build_with_chromium) { } else { deps = [ "//net/third_party/nss/ssl:libssl" ] - direct_dependent_configs = [ + public_configs = [ "//net/third_party/nss/ssl:ssl_config", "//third_party/nss:system_nss_no_ssl_config", ] @@ -101,7 +101,7 @@ if (rtc_build_ssl == 0) { # The subset of rtc_base approved for use outside of libjingle. static_library("rtc_base_approved") { configs += [ "..:common_config" ] - direct_dependent_configs = [ "..:common_inherited_config" ] + public_configs = [ "..:common_inherited_config" ] sources = [ "checks.cc", @@ -134,7 +134,7 @@ static_library("webrtc_base") { ":webrtc_base_config", ] - direct_dependent_configs = [ + public_configs = [ "..:common_inherited_config", ":webrtc_base_config", ] @@ -306,7 +306,7 @@ static_library("webrtc_base") { "../../boringssl/src/include", ] - direct_dependent_configs += [ ":webrtc_base_chromium_config" ] + public_configs += [ ":webrtc_base_chromium_config" ] } else { sources += [ "asyncinvoker.cc", @@ -445,7 +445,7 @@ static_library("webrtc_base") { cflags_cc += [ "-Wno-non-virtual-dtor" ] if (use_openssl) { - direct_dependent_configs += [ ":openssl_config" ] + public_configs += [ ":openssl_config" ] if (rtc_build_ssl) { deps += [ "//third_party/boringssl" ] } else { @@ -463,7 +463,7 @@ static_library("webrtc_base") { "opensslstreamadapter.h", ] } else { - direct_dependent_configs += [ ":no_openssl_config" ] + public_configs += [ ":no_openssl_config" ] sources += [ "nssidentity.cc", "nssidentity.h", |