| 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 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc | 6 # GYP: //third_party/android_protobuf/android_protobuf.gyp:android_protoc |
| 7 executable("android_protoc") { | 7 executable("android_protoc") { |
| 8 configs -= [ "//build/config/compiler:chromium_code" ] | 8 configs -= [ "//build/config/compiler:chromium_code" ] |
| 9 configs += [ "//build/config/compiler:no_chromium_code" ] | 9 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 10 | 10 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 include_dirs = [ | 112 include_dirs = [ |
| 113 "src/android", | 113 "src/android", |
| 114 "src/src", | 114 "src/src", |
| 115 ] | 115 ] |
| 116 | 116 |
| 117 if (is_clang) { | 117 if (is_clang) { |
| 118 cflags = [ | 118 cflags = [ |
| 119 "-Wno-null-conversion", | 119 "-Wno-null-conversion", |
| 120 "-Wno-tautological-undefined-compare", | 120 "-Wno-tautological-undefined-compare", |
| 121 "-Wno-unused-function", |
| 122 "-Wno-unused-local-typedef", |
| 121 ] | 123 ] |
| 122 } | 124 } |
| 123 defines = [ | 125 defines = [ |
| 124 # This macro must be defined to suppress the use | 126 # This macro must be defined to suppress the use |
| 125 # of dynamic_cast<>, which requires RTTI. | 127 # of dynamic_cast<>, which requires RTTI. |
| 126 "GOOGLE_PROTOBUF_NO_RTTI", | 128 "GOOGLE_PROTOBUF_NO_RTTI", |
| 127 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", | 129 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", |
| 128 ] | 130 ] |
| 129 } | 131 } |
| 130 } | 132 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 143 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", | 145 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", |
| 144 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", | 146 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", |
| 145 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano
Exception.java", | 147 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano
Exception.java", |
| 146 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", | 148 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", |
| 147 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", | 149 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", |
| 148 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", | 150 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", |
| 149 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", | 151 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", |
| 150 ] | 152 ] |
| 151 } | 153 } |
| 152 } | 154 } |
| OLD | NEW |