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

Side by Side Diff: third_party/protobuf/protobuf.gyp

Issue 11316370: [sync] Componentize sync: Part 4: Fix includes in third_party/protobuf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['use_system_protobuf==0', { 7 ['use_system_protobuf==0', {
8 'conditions': [ 8 'conditions': [
9 ['OS!="win"', { 9 ['OS!="win"', {
10 'variables': { 10 'variables': {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 'include_dirs': [ 174 'include_dirs': [
175 '<(config_h_dir)', 175 '<(config_h_dir)',
176 'src', 176 'src',
177 ], 177 ],
178 # This macro must be defined to suppress the use of dynamic_cast<>, 178 # This macro must be defined to suppress the use of dynamic_cast<>,
179 # which requires RTTI. 179 # which requires RTTI.
180 'defines': [ 180 'defines': [
181 'GOOGLE_PROTOBUF_NO_RTTI', 181 'GOOGLE_PROTOBUF_NO_RTTI',
182 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', 182 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
183 ], 183 ],
184 184 # On Win component builds, we must dynamically link protobuf_lite to
185 # avoid warning C4275: "non dll-interface class used as base for
186 # dll-interface class". See the "DLLs vs. static linking" section in
187 # third_party/protobuf/vsprojects/readme.txt.
188 'conditions': [
189 ['OS=="win" and component=="shared_library"', {
190 'defines': [
191 'LIBPROTOBUF_EXPORTS',
192 'LIBPROTOC_EXPORTS',
193 'PROTOBUF_USE_DLLS',
194 ],
195 }],
196 ],
185 'direct_dependent_settings': { 197 'direct_dependent_settings': {
186 'include_dirs': [ 198 'include_dirs': [
187 '<(config_h_dir)', 199 '<(config_h_dir)',
188 'src', 200 'src',
189 ], 201 ],
190 'defines': [ 202 'defines': [
191 'GOOGLE_PROTOBUF_NO_RTTI', 203 'GOOGLE_PROTOBUF_NO_RTTI',
192 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', 204 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
193 ], 205 ],
206 # On Win component builds, we must dynamically link protobuf_lite to
akalin 2012/12/13 02:04:50 it looks like the comment for the main define bloc
Raghu Simha 2012/12/13 20:07:49 Nice catch. I think it makes sense to delete the c
207 # avoid warning C4275: "non dll-interface class used as base for
208 # dll-interface class". See the "DLLs vs. static linking" section in
209 # third_party/protobuf/vsprojects/readme.txt.
210 'conditions': [
211 ['OS=="win" and component=="shared_library"', {
212 'defines': [
213 'LIBPROTOBUF_EXPORTS',
214 'LIBPROTOC_EXPORTS',
215 'PROTOBUF_USE_DLLS',
216 ],
217 }],
218 ],
194 }, 219 },
195 }, 220 },
196 # This is the full, heavy protobuf lib that's needed for c++ .proto's 221 # This is the full, heavy protobuf lib that's needed for c++ .proto's
197 # that don't specify the LITE_RUNTIME option. The protocol 222 # that don't specify the LITE_RUNTIME option. The protocol
198 # compiler itself (protoc) falls into that category. 223 # compiler itself (protoc) falls into that category.
199 # 224 #
200 # DO NOT LINK AGAINST THIS TARGET IN CHROME CODE --agl 225 # DO NOT LINK AGAINST THIS TARGET IN CHROME CODE --agl
201 { 226 {
202 'target_name': 'protobuf_full_do_not_use', 227 'target_name': 'protobuf_full_do_not_use',
203 'type': 'static_library', 228 'type': 'static_library',
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 'toolsets': ['host', 'target'], 496 'toolsets': ['host', 'target'],
472 }, 497 },
473 { 498 {
474 'target_name': 'py_proto', 499 'target_name': 'py_proto',
475 'type': 'none', 500 'type': 'none',
476 }, 501 },
477 ], 502 ],
478 }], 503 }],
479 ], 504 ],
480 } 505 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698