admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN Templates: Introduce rtc_shared_library

Browse Source 
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}
This commit is contained in:
ehmaldonado 2016-09-08 04:26:37 -07:00 committed by Commit bot
parent 76cd281200
commit acf9f4785a
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/api/BUILD.gn
View File

@ -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",

24
webrtc/build/webrtc.gni
View File

@ -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
}
}
}