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

Unified Diff: chrome/chrome_browser_extensions.gypi

Issue 11973004: Add filter fo chromeos dirs in filename_rules.gypi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 11 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
« no previous file with comments | « build/filename_rules.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'
}
« no previous file with comments | « build/filename_rules.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698