zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable libjingle_peerconnection_datachannelonly_so target.

Browse Source 
This change also wires up the rest of the production code in
webrtc/sdk/android to be built when the directory is a dependency.

BUG=webrtc:7613
NOTRY=True

Change-Id: Ideda181970a5a570c3f8148b033e471e926243d1
Reviewed-on: https://chromium-review.googlesource.com/548038
Reviewed-by: Zhi Huang <zhihuang@webrtc.org>
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18791}
This commit is contained in:
Henrik Kjellander
2017-06-27 08:56:46 +02:00
committed by Commit Bot
parent 542407cb6a
commit a7d0df7ac1
2 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
webrtc/sdk/android/BUILD.gn
View File

@ -10,6 +10,17 @@ import("//webrtc/webrtc.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
group("android") {
if (!build_with_chromium && is_android) {
public_deps = [
":libjingle_peerconnection_datachannelonly_so",
":libjingle_peerconnection_jni",
":libjingle_peerconnection_so",
":libwebrtc",
]
}
}
config("libjingle_peerconnection_jni_warnings_config") {
# The warnings below are enabled by default. Since GN orders compiler flags
# for a target before flags from configs, the only way to disable such
@ -267,31 +278,27 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
# The modular build targets can be used to build WebRTC with different
# functionalities. The users can choose either the real implemenation or the
# null implementation of the audio/video modules based on their requirments.
#
# For example, to build WebRTC with datachannel support only, we would need the
# the peerconnection and the null implementation of the audio, video and media
# module.
# rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
# sources = [
# "src/jni/jni_onload.cc",
# ]
#
# suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
# configs += [ "//build/config/android:hide_all_but_jni" ]
#
# deps = [
# ":base_jni",
# ":libjingle_peerconnection_metrics_default_jni",
# ":null_audio_jni",
# ":null_media_jni",
# ":null_video_jni",
# ":peerconnection_jni",
# "//webrtc/base:rtc_base",
# "//webrtc/base:rtc_base_approved",
# "//webrtc/pc:peerconnection",
# ]
# output_extension = "so"
# }
rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
sources = [
"src/jni/jni_onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ]
deps = [
":base_jni",
":libjingle_peerconnection_metrics_default_jni",
":null_audio_jni",
":null_media_jni",
":null_video_jni",
":peerconnection_jni",
"//webrtc/base:rtc_base",
"//webrtc/base:rtc_base_approved",
"//webrtc/pc:peerconnection",
]
output_extension = "so"
}
rtc_shared_library("libjingle_peerconnection_so") {
sources = [