OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 if (current_toolchain == host_toolchain) { | 5 if (current_toolchain == host_toolchain) { |
6 config("android_protoc_warnings") { | |
7 if (is_clang) { | |
Lei Zhang
2015/12/31 00:07:37
No if statement since the gyp version has these in
Nico
2015/12/31 02:44:17
Done, good point, thanks.
| |
8 cflags = [ | |
9 "-Wno-null-conversion", | |
10 "-Wno-tautological-undefined-compare", | |
11 "-Wno-unused-function", | |
12 "-Wno-unused-local-typedef", | |
13 ] | |
14 } | |
15 } | |
16 | |
6 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc | 17 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc |
7 executable("android_protoc") { | 18 executable("android_protoc") { |
8 configs -= [ "//build/config/compiler:chromium_code" ] | 19 configs -= [ "//build/config/compiler:chromium_code" ] |
9 configs += [ "//build/config/compiler:no_chromium_code" ] | 20 configs += [ |
21 "//build/config/compiler:no_chromium_code", | |
22 | |
23 # Must be after no_chromium_code so warning flags are ordered correctly. | |
24 ":android_protoc_warnings", | |
25 ] | |
10 | 26 |
11 deps = [ | 27 deps = [ |
12 "//build/config/sanitizers:deps", | 28 "//build/config/sanitizers:deps", |
13 "//third_party/zlib", | 29 "//third_party/zlib", |
14 ] | 30 ] |
15 | 31 |
16 sources = [ | 32 sources = [ |
17 "src/src/google/protobuf/compiler/code_generator.cc", | 33 "src/src/google/protobuf/compiler/code_generator.cc", |
18 "src/src/google/protobuf/compiler/command_line_interface.cc", | 34 "src/src/google/protobuf/compiler/command_line_interface.cc", |
19 "src/src/google/protobuf/compiler/cpp/cpp_enum.cc", | 35 "src/src/google/protobuf/compiler/cpp/cpp_enum.cc", |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
107 "src/src/google/protobuf/unknown_field_set.cc", | 123 "src/src/google/protobuf/unknown_field_set.cc", |
108 "src/src/google/protobuf/wire_format.cc", | 124 "src/src/google/protobuf/wire_format.cc", |
109 "src/src/google/protobuf/wire_format_lite.cc", | 125 "src/src/google/protobuf/wire_format_lite.cc", |
110 ] | 126 ] |
111 | 127 |
112 include_dirs = [ | 128 include_dirs = [ |
113 "src/android", | 129 "src/android", |
114 "src/src", | 130 "src/src", |
115 ] | 131 ] |
116 | 132 |
117 if (is_clang) { | |
118 cflags = [ | |
119 "-Wno-null-conversion", | |
120 "-Wno-tautological-undefined-compare", | |
121 ] | |
122 } | |
123 defines = [ | 133 defines = [ |
124 # This macro must be defined to suppress the use | 134 # This macro must be defined to suppress the use |
125 # of dynamic_cast<>, which requires RTTI. | 135 # of dynamic_cast<>, which requires RTTI. |
126 "GOOGLE_PROTOBUF_NO_RTTI", | 136 "GOOGLE_PROTOBUF_NO_RTTI", |
127 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", | 137 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", |
128 ] | 138 ] |
129 } | 139 } |
130 } | 140 } |
131 | 141 |
132 if (is_android) { | 142 if (is_android) { |
(...skipping 10 matching lines...) Expand all Loading... | |
143 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", | 153 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", |
144 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", | 154 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", |
145 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java", | 155 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java", |
146 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", | 156 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", |
147 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", | 157 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", |
148 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", | 158 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", |
149 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", | 159 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", |
150 ] | 160 ] |
151 } | 161 } |
152 } | 162 } |
OLD | NEW |