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

Unified Diff: cc/cc.gyp

Issue 1394353002: Add Protobuf support in cc for gfx objects (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build for other targets Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index a4f70ff16919287f272e93e9d4af04b04b2c0e42..3d6e2c8142fd8239ca4e8d3f4ecbe5d6b4280c76 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -12,11 +12,13 @@
'target_name': 'cc',
'type': '<(component)',
'dependencies': [
+ 'cc_proto',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/gpu/gpu.gyp:gpu',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
'<(DEPTH)/ui/events/events.gyp:events_base',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -372,6 +374,8 @@
'playback/raster_source_helper.h',
'playback/transform_display_item.cc',
'playback/transform_display_item.h',
+ 'proto/gfx_conversions.cc',
+ 'proto/gfx_conversions.h',
'quads/content_draw_quad_base.cc',
'quads/content_draw_quad_base.h',
'quads/debug_border_draw_quad.cc',
@@ -572,6 +576,31 @@
],
},
{
+ # GN version: "//cc/proto:cc_proto"
+ 'target_name': 'cc_proto',
+ 'type': '<(component)',
+ 'sources': [
+ 'proto/point.proto',
+ 'proto/pointf.proto',
+ 'proto/rect.proto',
+ 'proto/rectf.proto',
+ 'proto/size.proto',
+ 'proto/sizef.proto',
+ 'proto/transform.proto',
+ ],
+ 'defines': [
+ 'CC_PROTO_IMPLEMENTATION=1',
+ ],
+ 'variables': {
+ 'enable_wexit_time_destructors': 1,
danakj 2015/10/14 23:10:10 what is it? can you explain in comment
David Trainor- moved to gerrit 2015/10/15 22:18:02 I wasn't sure either, but sync did it for their pr
danakj 2015/10/16 22:04:24 But why is it important for the proto code? Is it?
+ 'proto_in_dir': 'proto',
+ 'proto_out_dir': 'cc/proto',
+ 'cc_generator_options': 'dllexport_decl=CC_PROTO_EXPORT:',
+ 'cc_include': 'cc/proto/cc_proto_export.h',
+ },
+ 'includes': [ '../build/protoc.gypi' ]
+ },
+ {
# GN version: //cc/surfaces
'target_name': 'cc_surfaces',
'type': '<(component)',

Powered by Google App Engine
This is Rietveld 408576698