| Index: chrome/chrome_browser_extensions.gypi
|
| diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
|
| index 567dd3d268453c853c45a9a5ba231d8f8983e57b..37fe71a7ba9e8e3bfa4712a20008e4a2bb0d3fad 100644
|
| --- a/chrome/chrome_browser_extensions.gypi
|
| +++ b/chrome/chrome_browser_extensions.gypi
|
| @@ -23,7 +23,6 @@
|
| 'common',
|
| 'common/extensions/api/api.gyp:api',
|
| 'common_net',
|
| - 'contacts_proto',
|
| 'debugger',
|
| 'in_memory_url_index_cache_proto',
|
| 'installer_util',
|
| @@ -743,6 +742,7 @@
|
| '../build/linux/system.gyp:dbus',
|
| '../third_party/libevent/libevent.gyp:libevent',
|
| 'browser/chromeos/input_method/input_method.gyp:gencode',
|
| + 'contacts_proto',
|
| ],
|
| 'sources!': [
|
| 'browser/extensions/default_apps.cc',
|
| @@ -914,17 +914,6 @@
|
| }],
|
| ],
|
| },
|
| - {
|
| - # Protobuf compiler / generator for contacts-related protocol buffers.
|
| - 'target_name': 'contacts_proto',
|
| - 'type': 'static_library',
|
| - 'sources': [ 'browser/chromeos/contacts/contact.proto' ],
|
| - 'variables': {
|
| - 'proto_in_dir': 'browser/chromeos/contacts',
|
| - 'proto_out_dir': 'chrome/browser/chromeos/contacts',
|
| - },
|
| - 'includes': [ '../build/protoc.gypi' ]
|
| - },
|
| ],
|
| 'conditions': [
|
| ['OS=="win"', {
|
| @@ -963,6 +952,21 @@
|
| },
|
| },
|
| ],
|
| - }, ], # 'OS=="win"'
|
| + },], # 'OS=="win"'
|
| + ['chromeos==1', {
|
| + 'targets': [
|
| + {
|
| + # Protobuf compiler / generator for contacts-related protocol buffers.
|
| + 'target_name': 'contacts_proto',
|
| + 'type': 'static_library',
|
| + 'sources': [ 'browser/chromeos/contacts/contact.proto' ],
|
| + 'variables': {
|
| + 'proto_in_dir': 'browser/chromeos/contacts',
|
| + 'proto_out_dir': 'chrome/browser/chromeos/contacts',
|
| + },
|
| + 'includes': [ '../build/protoc.gypi' ]
|
| + },
|
| + ],
|
| + },], # 'chromeos=1'
|
| ], # 'conditions'
|
| }
|
|
|