| 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 | |
| 16 executable("android_protoc") { | 15 executable("android_protoc") { |
| 17 configs -= [ | 16 configs -= [ |
| 18 "//build/config/compiler:chromium_code", | 17 "//build/config/compiler:chromium_code", |
| 19 | 18 |
| 20 # Does not compile with sanitizers. | 19 # Does not compile with sanitizers. |
| 21 "//build/config/sanitizers:default_sanitizer_flags", | 20 "//build/config/sanitizers:default_sanitizer_flags", |
| 22 ] | 21 ] |
| 23 | 22 |
| 24 configs += [ | 23 configs += [ |
| 25 "//build/config/compiler:no_chromium_code", | 24 "//build/config/compiler:no_chromium_code", |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 # of dynamic_cast<>, which requires RTTI. | 138 # of dynamic_cast<>, which requires RTTI. |
| 140 "GOOGLE_PROTOBUF_NO_RTTI", | 139 "GOOGLE_PROTOBUF_NO_RTTI", |
| 141 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", | 140 "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", |
| 142 ] | 141 ] |
| 143 } | 142 } |
| 144 } | 143 } |
| 145 | 144 |
| 146 if (is_android) { | 145 if (is_android) { |
| 147 import("//build/config/android/rules.gni") | 146 import("//build/config/android/rules.gni") |
| 148 | 147 |
| 149 # GYP: //third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javal
ib | |
| 150 android_library("protobuf_nano_javalib") { | 148 android_library("protobuf_nano_javalib") { |
| 151 chromium_code = false | 149 chromium_code = false |
| 152 java_files = [ | 150 java_files = [ |
| 153 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
ExtendableMessageNano.java", | 151 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
ExtendableMessageNano.java", |
| 154 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
MessageNano.java", | 152 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
MessageNano.java", |
| 155 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
MessageNanoCreator.java", | 153 "src/java/src/device/main/java/com/google/protobuf/nano/android/Parcelable
MessageNanoCreator.java", |
| 156 "src/java/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.
java", | 154 "src/java/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.
java", |
| 157 "src/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano
.java", | 155 "src/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano
.java", |
| 158 "src/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.jav
a", | 156 "src/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.jav
a", |
| 159 "src/java/src/main/java/com/google/protobuf/nano/Extension.java", | 157 "src/java/src/main/java/com/google/protobuf/nano/Extension.java", |
| 160 "src/java/src/main/java/com/google/protobuf/nano/FieldArray.java", | 158 "src/java/src/main/java/com/google/protobuf/nano/FieldArray.java", |
| 161 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", | 159 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java", |
| 162 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", | 160 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", |
| 163 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano
Exception.java", | 161 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano
Exception.java", |
| 164 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", | 162 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", |
| 165 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", | 163 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", |
| 166 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", | 164 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", |
| 167 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", | 165 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", |
| 168 ] | 166 ] |
| 169 } | 167 } |
| 170 } | 168 } |
| OLD | NEW |