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

Add build_protobuf variable.

Browse Source 
This makes it possible to use protobuffers with
an external protobuf library instead of the one that
comes with the WebRTC code.

NOTRY=True

Review URL: https://codereview.webrtc.org/1589433002

Cr-Commit-Position: refs/heads/master@{#11236}
This commit is contained in:
kjellander 2016-01-13 05:46:58 -08:00 committed by Commit bot
parent a276e73168
commit 292e192f17
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/build/common.gypi
View File

@ -91,6 +91,7 @@
'build_libyuv%': 1,
'build_openmax_dl%': 1,
'build_opus%': 1,
'build_protobuf%': 1,
'build_ssl%': 1,
# Disable by default

22
webrtc/build/protoc.gypi
View File

@ -109,10 +109,6 @@
'process_outputs_as_sources': 1,
},
],
'dependencies': [
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'<(DEPTH)',
@ -123,12 +119,20 @@
'<(DEPTH)',
]
},
'export_dependent_settings': [
# The generated headers reference headers within protobuf_lite,
# so dependencies must be able to find those headers too.
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
],
# This target exports a hard dependency because it generates header
# files.
'hard_dependency': 1,
'conditions': [
['build_protobuf==1', {
'dependencies': [
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
],
'export_dependent_settings': [
# The generated headers reference headers within protobuf_lite,
# so dependencies must be able to find those headers too.
'<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
],
}],
],
}