Index: sync/sync.gyp |
diff --git a/sync/sync.gyp b/sync/sync.gyp |
index d3383b5f2b2706e11c735c3d2a63430a4327fb2b..ea58efba031a858dcc0fef8f213da434b609ca86 100644 |
--- a/sync/sync.gyp |
+++ b/sync/sync.gyp |
@@ -22,6 +22,7 @@ |
'dependencies': [ |
'sync_core', |
'sync_proto', |
+ 'attachment_store_proto', |
maniscalco
2014/10/21 21:41:03
sort order?
pavely
2014/10/24 20:42:55
Done.
|
], |
'export_dependent_settings': [ |
'sync_proto', |
@@ -53,6 +54,7 @@ |
'../third_party/zlib/zlib.gyp:zlib', |
'../url/url.gyp:url_lib', |
'sync_proto', |
+ 'attachment_store_proto', |
maniscalco
2014/10/21 21:41:03
sort order?
pavely
2014/10/24 20:42:55
Done.
|
], |
'export_dependent_settings': [ |
'sync_proto', |
@@ -518,5 +520,27 @@ |
'../build/protoc.gypi' |
], |
}, |
+ { |
+ # Contains attachment_store protobuf definitions. Do not depend on this |
+ # directly. |
+ # Depend on the 'sync' target to get the relevant C++ code, too. |
+ # |
+ # GN version: //sync/internal_api/attachments/proto |
+ 'target_name': 'attachment_store_proto', |
+ 'type': '<(component)', |
+ 'sources': [ |
+ # NOTE: If you add a file to this list, also add it to |
+ # sync/internal_api/attachments/proto/BUILD.gn |
+ 'internal_api/attachments/proto/attachment_store.proto', |
+ ], |
+ 'variables': { |
+ 'enable_wexit_time_desctructors': 1, |
maniscalco
2014/10/21 21:41:04
Can you explain to me what this is for. Is it nec
pavely
2014/10/24 20:42:55
It enables "exit time destructors" warning. Allows
maniscalco
2014/10/24 21:52:39
Ah! Cool. I agree that we want this. Good catch
|
+ 'proto_in_dir': './internal_api/attachments/proto', |
maniscalco
2014/10/21 21:41:04
Is the leading ./ important? In other gyp files,
pavely
2014/10/24 20:42:55
Removed ./
|
+ 'proto_out_dir': 'sync/internal_api/attachments/proto', |
+ }, |
+ 'includes': [ |
+ '../build/protoc.gypi' |
+ ], |
+ }, |
], |
} |