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

Import proto_library.gni when rtc_enable_protobuf is true

Browse Source 
Import proto_library.gni when rtc_enable_protobuf is true instead of when
build_with_mozilla is false.

Makes it maybe easier to reason about the intention (e.g. intention is to not
compile any protobuf in, hence flag rtc_enable_protobuf)

The build file could not work if build_with_mozilla = true but
rtc_enable_protobuf = true.

Bug: webrtc:10338
Change-Id: I26e5983bd1519aa46c308b11796d518de5ef7597
Reviewed-on: https://webrtc-review.googlesource.com/c/123763
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26868}
This commit is contained in:
Kimmo Kinnunen
2019-02-26 11:46:17 +02:00
committed by Commit Bot
parent e12a1c7644
commit 08f6a6c672
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -91,6 +91,7 @@ Intel Corporation <*@intel.com>
Microsoft Corporation <*@microsoft.com> Microsoft Corporation <*@microsoft.com>
MIPS Technologies <*@mips.com> MIPS Technologies <*@mips.com>
Mozilla Foundation <*@mozilla.com> Mozilla Foundation <*@mozilla.com>
NVIDIA Corporation <*@nvidia.com>
Opera Software ASA <*@opera.com> Opera Software ASA <*@opera.com>
Optical Tone Ltd <*@opticaltone.com> Optical Tone Ltd <*@opticaltone.com>
Sinch AB <*@sinch.com> Sinch AB <*@sinch.com>

2
BUILD.gn
View File

@ -15,7 +15,7 @@
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("webrtc.gni") import("webrtc.gni")
if (!build_with_mozilla) { if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
} }
if (is_android) { if (is_android) {

2
logging/BUILD.gn
View File

@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("../webrtc.gni") import("../webrtc.gni")
if (!build_with_mozilla) { if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
} }
if (is_android) { if (is_android) {

2
modules/audio_coding/BUILD.gn
View File

@ -8,7 +8,7 @@
import("../../webrtc.gni") import("../../webrtc.gni")
import("audio_coding.gni") import("audio_coding.gni")
if (!build_with_mozilla) { if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
} }

2
modules/audio_processing/BUILD.gn
View File

@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("../../webrtc.gni") import("../../webrtc.gni")
if (!build_with_mozilla) { if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
} }

5
rtc_tools/BUILD.gn
View File

@ -5,9 +5,10 @@
# tree. An additional intellectual property rights grant can be found # tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//third_party/protobuf/proto_library.gni")
import("../webrtc.gni") import("../webrtc.gni")
if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni")
}
group("rtc_tools") { group("rtc_tools") {
# This target shall build all targets in tools/. # This target shall build all targets in tools/.

4
rtc_tools/network_tester/BUILD.gn
View File

@ -6,8 +6,10 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//third_party/protobuf/proto_library.gni")
import("../../webrtc.gni") import("../../webrtc.gni")
if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni")
}
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
proto_library("network_tester_config_proto") { proto_library("network_tester_config_proto") {