Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(993)

Side by Side Diff: third_party/android_protobuf/BUILD.gn

Issue 1149283005: Roll src/third_party/android_protobuf 94f522f9:999188d0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trying jbudorick@'s suggestion Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | third_party/android_protobuf/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
21 "src/src/google/protobuf/compiler/cpp/cpp_field.cc", 21 "src/src/google/protobuf/compiler/cpp/cpp_field.cc",
22 "src/src/google/protobuf/compiler/cpp/cpp_file.cc", 22 "src/src/google/protobuf/compiler/cpp/cpp_file.cc",
23 "src/src/google/protobuf/compiler/cpp/cpp_generator.cc", 23 "src/src/google/protobuf/compiler/cpp/cpp_generator.cc",
24 "src/src/google/protobuf/compiler/cpp/cpp_helpers.cc", 24 "src/src/google/protobuf/compiler/cpp/cpp_helpers.cc",
25 "src/src/google/protobuf/compiler/cpp/cpp_message.cc", 25 "src/src/google/protobuf/compiler/cpp/cpp_message.cc",
26 "src/src/google/protobuf/compiler/cpp/cpp_message_field.cc", 26 "src/src/google/protobuf/compiler/cpp/cpp_message_field.cc",
27 "src/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc", 27 "src/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
28 "src/src/google/protobuf/compiler/cpp/cpp_service.cc", 28 "src/src/google/protobuf/compiler/cpp/cpp_service.cc",
29 "src/src/google/protobuf/compiler/cpp/cpp_string_field.cc", 29 "src/src/google/protobuf/compiler/cpp/cpp_string_field.cc",
30 "src/src/google/protobuf/compiler/importer.cc", 30 "src/src/google/protobuf/compiler/importer.cc",
31 "src/src/google/protobuf/compiler/java/java_context.cc",
32 "src/src/google/protobuf/compiler/java/java_doc_comment.cc",
31 "src/src/google/protobuf/compiler/java/java_enum.cc", 33 "src/src/google/protobuf/compiler/java/java_enum.cc",
32 "src/src/google/protobuf/compiler/java/java_enum_field.cc", 34 "src/src/google/protobuf/compiler/java/java_enum_field.cc",
33 "src/src/google/protobuf/compiler/java/java_extension.cc", 35 "src/src/google/protobuf/compiler/java/java_extension.cc",
34 "src/src/google/protobuf/compiler/java/java_field.cc", 36 "src/src/google/protobuf/compiler/java/java_field.cc",
35 "src/src/google/protobuf/compiler/java/java_file.cc", 37 "src/src/google/protobuf/compiler/java/java_file.cc",
36 "src/src/google/protobuf/compiler/java/java_generator.cc", 38 "src/src/google/protobuf/compiler/java/java_generator.cc",
39 "src/src/google/protobuf/compiler/java/java_generator_factory.cc",
37 "src/src/google/protobuf/compiler/java/java_helpers.cc", 40 "src/src/google/protobuf/compiler/java/java_helpers.cc",
41 "src/src/google/protobuf/compiler/java/java_lazy_message_field.cc",
38 "src/src/google/protobuf/compiler/java/java_message.cc", 42 "src/src/google/protobuf/compiler/java/java_message.cc",
39 "src/src/google/protobuf/compiler/java/java_message_field.cc", 43 "src/src/google/protobuf/compiler/java/java_message_field.cc",
44 "src/src/google/protobuf/compiler/java/java_name_resolver.cc",
40 "src/src/google/protobuf/compiler/java/java_primitive_field.cc", 45 "src/src/google/protobuf/compiler/java/java_primitive_field.cc",
41 "src/src/google/protobuf/compiler/java/java_service.cc", 46 "src/src/google/protobuf/compiler/java/java_service.cc",
47 "src/src/google/protobuf/compiler/java/java_shared_code_generator.cc",
48 "src/src/google/protobuf/compiler/java/java_string_field.cc",
42 "src/src/google/protobuf/compiler/javamicro/javamicro_enum.cc", 49 "src/src/google/protobuf/compiler/javamicro/javamicro_enum.cc",
43 "src/src/google/protobuf/compiler/javamicro/javamicro_enum_field.cc", 50 "src/src/google/protobuf/compiler/javamicro/javamicro_enum_field.cc",
44 "src/src/google/protobuf/compiler/javamicro/javamicro_field.cc", 51 "src/src/google/protobuf/compiler/javamicro/javamicro_field.cc",
45 "src/src/google/protobuf/compiler/javamicro/javamicro_file.cc", 52 "src/src/google/protobuf/compiler/javamicro/javamicro_file.cc",
46 "src/src/google/protobuf/compiler/javamicro/javamicro_generator.cc", 53 "src/src/google/protobuf/compiler/javamicro/javamicro_generator.cc",
47 "src/src/google/protobuf/compiler/javamicro/javamicro_helpers.cc", 54 "src/src/google/protobuf/compiler/javamicro/javamicro_helpers.cc",
48 "src/src/google/protobuf/compiler/javamicro/javamicro_message.cc", 55 "src/src/google/protobuf/compiler/javamicro/javamicro_message.cc",
49 "src/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc", 56 "src/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc",
50 "src/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc", 57 "src/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc",
51 "src/src/google/protobuf/compiler/javanano/javanano_enum.cc", 58 "src/src/google/protobuf/compiler/javanano/javanano_enum.cc",
(...skipping 17 matching lines...) Expand all
69 "src/src/google/protobuf/descriptor.pb.cc", 76 "src/src/google/protobuf/descriptor.pb.cc",
70 "src/src/google/protobuf/descriptor_database.cc", 77 "src/src/google/protobuf/descriptor_database.cc",
71 "src/src/google/protobuf/dynamic_message.cc", 78 "src/src/google/protobuf/dynamic_message.cc",
72 "src/src/google/protobuf/extension_set.cc", 79 "src/src/google/protobuf/extension_set.cc",
73 "src/src/google/protobuf/extension_set_heavy.cc", 80 "src/src/google/protobuf/extension_set_heavy.cc",
74 "src/src/google/protobuf/generated_message_reflection.cc", 81 "src/src/google/protobuf/generated_message_reflection.cc",
75 "src/src/google/protobuf/generated_message_util.cc", 82 "src/src/google/protobuf/generated_message_util.cc",
76 "src/src/google/protobuf/io/coded_stream.cc", 83 "src/src/google/protobuf/io/coded_stream.cc",
77 "src/src/google/protobuf/io/gzip_stream.cc", 84 "src/src/google/protobuf/io/gzip_stream.cc",
78 "src/src/google/protobuf/io/printer.cc", 85 "src/src/google/protobuf/io/printer.cc",
86 "src/src/google/protobuf/io/strtod.cc",
79 "src/src/google/protobuf/io/tokenizer.cc", 87 "src/src/google/protobuf/io/tokenizer.cc",
80 "src/src/google/protobuf/io/zero_copy_stream.cc", 88 "src/src/google/protobuf/io/zero_copy_stream.cc",
81 "src/src/google/protobuf/io/zero_copy_stream_impl.cc", 89 "src/src/google/protobuf/io/zero_copy_stream_impl.cc",
82 "src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc", 90 "src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
83 "src/src/google/protobuf/message.cc", 91 "src/src/google/protobuf/message.cc",
84 "src/src/google/protobuf/message_lite.cc", 92 "src/src/google/protobuf/message_lite.cc",
85 "src/src/google/protobuf/reflection_ops.cc", 93 "src/src/google/protobuf/reflection_ops.cc",
86 "src/src/google/protobuf/repeated_field.cc", 94 "src/src/google/protobuf/repeated_field.cc",
87 "src/src/google/protobuf/service.cc", 95 "src/src/google/protobuf/service.cc",
96 "src/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
97 "src/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc",
88 "src/src/google/protobuf/stubs/common.cc", 98 "src/src/google/protobuf/stubs/common.cc",
89 "src/src/google/protobuf/stubs/hash.cc", 99 "src/src/google/protobuf/stubs/hash.cc",
90 "src/src/google/protobuf/stubs/once.cc", 100 "src/src/google/protobuf/stubs/once.cc",
101 "src/src/google/protobuf/stubs/stringprintf.cc",
91 "src/src/google/protobuf/stubs/structurally_valid.cc", 102 "src/src/google/protobuf/stubs/structurally_valid.cc",
92 "src/src/google/protobuf/stubs/strutil.cc", 103 "src/src/google/protobuf/stubs/strutil.cc",
93 "src/src/google/protobuf/stubs/substitute.cc", 104 "src/src/google/protobuf/stubs/substitute.cc",
94 "src/src/google/protobuf/text_format.cc", 105 "src/src/google/protobuf/text_format.cc",
95 "src/src/google/protobuf/unknown_field_set.cc", 106 "src/src/google/protobuf/unknown_field_set.cc",
96 "src/src/google/protobuf/wire_format.cc", 107 "src/src/google/protobuf/wire_format.cc",
97 "src/src/google/protobuf/wire_format_lite.cc", 108 "src/src/google/protobuf/wire_format_lite.cc",
98 ] 109 ]
99 110
100 include_dirs = [ 111 include_dirs = [
(...skipping 19 matching lines...) Expand all
120 if (is_android) { 131 if (is_android) {
121 import("//build/config/android/rules.gni") 132 import("//build/config/android/rules.gni")
122 133
123 # GYP: //third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javal ib 134 # GYP: //third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javal ib
124 android_library("protobuf_nano_javalib") { 135 android_library("protobuf_nano_javalib") {
125 java_files = [ 136 java_files = [
126 "src/java/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano. java", 137 "src/java/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano. java",
127 "src/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano .java", 138 "src/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano .java",
128 "src/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.jav a", 139 "src/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.jav a",
129 "src/java/src/main/java/com/google/protobuf/nano/Extension.java", 140 "src/java/src/main/java/com/google/protobuf/nano/Extension.java",
141 "src/java/src/main/java/com/google/protobuf/nano/FieldArray.java",
142 "src/java/src/main/java/com/google/protobuf/nano/FieldData.java",
130 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java", 143 "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java",
131 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java", 144 "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNano Exception.java",
132 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java", 145 "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java",
133 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java", 146 "src/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java",
134 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java", 147 "src/java/src/main/java/com/google/protobuf/nano/UnknownFieldData.java",
135 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java", 148 "src/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java",
136 ] 149 ]
137 } 150 }
138 } 151 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/android_protobuf/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698