From acf9f4785af752d823b7e4e465113f0e8b2c5fd7 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Thu, 8 Sep 2016 04:26:37 -0700 Subject: [PATCH] GN Templates: Introduce rtc_shared_library libjingle_peerconnection_so is not including common_config, which is causing some differences is the defines. We'd like to prevent that happening in the future. NOTRY=True BUG=webrtc:5949 Review-Url: https://codereview.webrtc.org/2325603002 Cr-Commit-Position: refs/heads/master@{#14127} --- webrtc/api/BUILD.gn | 4 ++-- webrtc/build/webrtc.gni | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 69e0a85cf9..cae9e65d4e 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -220,12 +220,12 @@ if (is_android && !build_with_chromium) { } } - shared_library("libjingle_peerconnection_so") { + rtc_shared_library("libjingle_peerconnection_so") { sources = [ "android/jni/jni_onload.cc", ] - configs -= [ "//build/config/android:hide_native_jni_exports" ] + suppressed_configs += [ "//build/config/android:hide_native_jni_exports" ] deps = [ ":libjingle_peerconnection", diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index 5c188a05bf..71a4eda8be 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -215,6 +215,11 @@ set_defaults("rtc_static_library") { suppressed_configs = [] } +set_defaults("rtc_shared_library") { + configs = rtc_add_configs + suppressed_configs = [] +} + template("rtc_test") { test(target_name) { forward_variables_from(invoker, @@ -295,3 +300,22 @@ template("rtc_static_library") { } } } + +template("rtc_shared_library") { + shared_library(target_name) { + forward_variables_from(invoker, + "*", + [ + "configs", + "public_configs", + "suppressed_configs", + ]) + configs += invoker.configs + configs -= rtc_remove_configs + configs -= invoker.suppressed_configs + public_configs = [ rtc_common_inherited_config ] + if (defined(invoker.public_configs)) { + public_configs += invoker.public_configs + } + } +}