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

Use 'public_deps' to depend on nacl_io [1].

Browse Source 
Some NaCl system headers live in a special directory and the
toolchain doesn't propagate the -I compiler flag [2].

A common workaround in Chromium is to use 'public_deps' in order
to propagate //native_client_sdk/src/libraries/nacl_io:nacl_io_include_dirs
one step further in the build graph.

[1] - https://cs.chromium.org/chromium/src/native_client_sdk/src/libraries/nacl_io/
[2] - -Inative_client_sdk/src/libraries/third_party/newlib-extras

Bug: chromium:925028
Change-Id: I5145b80c2ae6969f79fcbfcf93a6b05c8a122746
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129701
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27373}
This commit is contained in:
Mirko Bonadei
2019-03-29 13:34:46 +01:00
committed by Commit Bot
parent 397b5b56e0
commit a7d8f19a77
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/BUILD.gn
View File

@ -168,11 +168,6 @@ rtc_static_library("libjingle_peerconnection_api") {
"../rtc_base:rtc_base_approved",
"../rtc_base/system:rtc_export",
]
if (is_nacl) {
# This is needed by .h files included from rtc_base.
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
}
rtc_source_set("scoped_refptr") {

4
media/BUILD.gn
View File

@ -136,10 +136,6 @@ rtc_static_library("rtc_media_base") {
if (!build_with_mozilla) {
deps += [ "../p2p" ]
}
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
}
rtc_static_library("rtc_constants") {

6
p2p/BUILD.gn
View File

@ -108,12 +108,6 @@ rtc_static_library("rtc_p2p") {
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
if (build_with_chromium) {
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
}
}
if (rtc_include_tests) {

7
rtc_base/BUILD.gn
View File

@ -88,6 +88,7 @@ rtc_source_set("rtc_base_approved") {
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
public_deps = [] # no-presubmit-check TODO(webrtc:8603)
sources = [
"bind.h",
@ -149,14 +150,14 @@ rtc_source_set("rtc_base_approved") {
}
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ] # no-presubmit-check TODO(webrtc:8603)
}
if (is_android) {
libs = [ "log" ]
}
public_deps = [ # no-presubmit-check TODO(webrtc:8603)
public_deps += [ # no-presubmit-check TODO(webrtc:8603)
":atomicops",
":criticalsection",
":logging",
@ -1006,7 +1007,7 @@ rtc_static_library("rtc_base") {
}
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ] # no-presubmit-check TODO(webrtc:8603)
defines += [ "timezone=_timezone" ]
sources -= [ "ifaddrs_converter.cc" ]
}

3
rtc_base/memory/BUILD.gn
View File

@ -44,9 +44,6 @@ rtc_source_set("fifo_buffer") {
deps = [
"..:rtc_base",
]
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
}
rtc_source_set("unittests") {