Minor cleanup in protobuf GYP rules
BUG=
TEST=
REF_BUG=29970663
REF_CL=126786187
REF_TIME=2016-07-07T18:35:24+09:00
REF_TIME_RAW=1467884124 +0900
Hiroyuki Komatsu
7 years ago
| 0 | 0 |
MAJOR=2
|
| 1 | 1 |
MINOR=18
|
| 2 | |
BUILD=2576
|
|
2 |
BUILD=2577
|
| 3 | 3 |
REVISION=102
|
| 4 | 4 |
# CAUTION: NACL_DICTIONARY_VERSION is going to be migrated to ENGINE_VERSION.
|
| 5 | 5 |
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
|
| 54 | 54 |
'protobuf_prebuilt_jar_path': '',
|
| 55 | 55 |
|
| 56 | 56 |
'protobuf_cpp_root': '<(protobuf_root)/src/google/protobuf',
|
|
57 |
# Sources for Proto3.
|
| 57 | 58 |
'protobuf_sources': [
|
| 58 | 59 |
'<(protobuf_cpp_root)/any.cc',
|
| 59 | 60 |
'<(protobuf_cpp_root)/arena.cc',
|
|
| 98 | 99 |
'<(protobuf_cpp_root)/wire_format.cc',
|
| 99 | 100 |
'<(protobuf_cpp_root)/wire_format_lite.cc',
|
| 100 | 101 |
],
|
|
102 |
# Sources for Proto3.
|
| 101 | 103 |
'protoc_sources': [
|
| 102 | 104 |
'<(protobuf_cpp_root)/any.cc',
|
| 103 | 105 |
'<(protobuf_cpp_root)/arena.cc',
|
|
| 225 | 227 |
'-lprotobuf',
|
| 226 | 228 |
],
|
| 227 | 229 |
},
|
| 228 | |
}, { # else
|
|
230 |
},
|
|
231 |
{ # else
|
| 229 | 232 |
'sources': ['<@(protobuf_sources)'],
|
| 230 | 233 |
'include_dirs': [
|
| 231 | 234 |
'<(protobuf_root)/src',
|
|
| 274 | 277 |
'dependencies': [
|
| 275 | 278 |
'protobuf',
|
| 276 | 279 |
],
|
| 277 | |
'include_dirs': [
|
| 278 | |
'<(protobuf_root)/src',
|
| 279 | |
],
|
| 280 | 280 |
'conditions': [
|
| 281 | |
['use_libprotobuf==0', {
|
|
281 |
[
|
|
282 |
'use_libprotobuf==0', {
|
| 282 | 283 |
'sources': ['<@(protoc_sources)'],
|
|
284 |
'include_dirs': [
|
|
285 |
'<(protobuf_root)/src',
|
|
286 |
],
|
| 283 | 287 |
'msvs_disabled_warnings': [
|
| 284 | 288 |
'<@(msvc_disabled_warnings_for_protoc)',
|
| 285 | 289 |
],
|