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") { | 6 config("android_protoc_warnings") { |
7 cflags = [ | 7 cflags = [ |
8 "-Wno-null-conversion", | 8 "-Wno-null-conversion", |
9 "-Wno-tautological-undefined-compare", | 9 "-Wno-tautological-undefined-compare", |
10 "-Wno-unused-function", | 10 "-Wno-unused-function", |
11 "-Wno-unused-local-typedef", | 11 "-Wno-unused-local-typedef", |
12 ] | 12 ] |
13 } | 13 } |
14 | 14 |
15 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc | 15 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc |
16 executable("android_protoc") { | 16 executable("android_protoc") { |
17 configs -= [ "//build/config/compiler:chromium_code" ] | 17 # Does not compile with sanitizers. |
brettw
2016/01/19 20:39:43
Can you move this down to above the sanitizer flag
agrieve
2016/02/02 19:22:31
Done.
| |
18 configs -= [ | |
19 "//build/config/compiler:chromium_code", | |
20 "//build/config/sanitizers:default_sanitizer_flags", | |
21 "//build/config/sanitizers:default_sanitizer_coverage_flags", | |
22 ] | |
23 | |
18 configs += [ | 24 configs += [ |
19 "//build/config/compiler:no_chromium_code", | 25 "//build/config/compiler:no_chromium_code", |
20 | 26 |
21 # Must be after no_chromium_code so warning flags are ordered correctly. | 27 # Must be after no_chromium_code so warning flags are ordered correctly. |
22 ":android_protoc_warnings", | 28 ":android_protoc_warnings", |
23 ] | 29 ] |
24 | 30 |
25 deps = [ | 31 deps = [ |
26 "//build/config/sanitizers:deps", | 32 "//build/config/sanitizers:deps", |
27 "//third_party/zlib", | 33 "//third_party/zlib", |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
151 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", | 157 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", |
152 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", | 158 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", |
153 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java", | 159 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java", |
154 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", | 160 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", |
155 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", | 161 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", |
156 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", | 162 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", |
157 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", | 163 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", |
158 ] | 164 ] |
159 } | 165 } |
160 } | 166 } |
OLD | NEW |