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

Unified Diff: chrome/chrome_utility.gypi

Issue 345693002: Extensions: Split extensions utility IPC messages into its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable another test Created 6 years, 6 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 | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/chrome_utility_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_utility.gypi
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
index b9c8752a1a332de35d76a36cd8dc4c13ea72f53c..7ce36a60b1f814107868d32a849ba4fb11c1902a 100644
--- a/chrome/chrome_utility.gypi
+++ b/chrome/chrome_utility.gypi
@@ -13,6 +13,17 @@
'utility/cloud_print/bitmap_image.h',
'utility/cloud_print/pwg_encoder.cc',
'utility/cloud_print/pwg_encoder.h',
+ 'utility/local_discovery/service_discovery_message_handler.cc',
+ 'utility/local_discovery/service_discovery_message_handler.h',
+ 'utility/printing_handler.cc',
+ 'utility/printing_handler.h',
+ 'utility/utility_message_handler.h',
+ 'utility/web_resource_unpacker.cc',
+ 'utility/web_resource_unpacker.h',
+ ],
+ 'chrome_utility_extensions_sources': [
+ 'utility/extensions/extensions_handler.cc',
+ 'utility/extensions/extensions_handler.h',
'utility/extensions/unpacker.cc',
'utility/extensions/unpacker.h',
'utility/image_writer/disk_unmounter_mac.cc',
@@ -25,15 +36,6 @@
'utility/image_writer/image_writer_handler.h',
'utility/image_writer/image_writer_mac.cc',
'utility/image_writer/image_writer_win.cc',
- 'utility/local_discovery/service_discovery_message_handler.cc',
- 'utility/local_discovery/service_discovery_message_handler.h',
- 'utility/printing_handler.cc',
- 'utility/printing_handler.h',
- 'utility/profile_import_handler.cc',
- 'utility/profile_import_handler.h',
- 'utility/utility_message_handler.h',
- 'utility/web_resource_unpacker.cc',
- 'utility/web_resource_unpacker.h',
],
'chrome_utility_importer_sources': [
'utility/importer/bookmark_html_reader.cc',
@@ -60,6 +62,8 @@
'utility/importer/nss_decryptor_win.h',
'utility/importer/safari_importer.h',
'utility/importer/safari_importer.mm',
+ 'utility/profile_import_handler.cc',
+ 'utility/profile_import_handler.h',
],
'chrome_utility_shared_media_sources': [
'utility/media_galleries/image_metadata_extractor.cc',
@@ -71,6 +75,10 @@
'utility/media_galleries/media_metadata_parser.cc',
'utility/media_galleries/media_metadata_parser.h',
],
+ 'chrome_utility_mac_media_gallery_sources': [
+ 'utility/media_galleries/iphoto_library_parser.cc',
+ 'utility/media_galleries/iphoto_library_parser.h',
+ ],
'chrome_utility_win_mac_media_gallery_sources': [
'utility/media_galleries/iapps_xml_utils.cc',
'utility/media_galleries/iapps_xml_utils.h',
@@ -102,33 +110,15 @@
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
'common',
- 'common/extensions/api/api.gyp:chrome_api',
],
'include_dirs': [
'..',
'<(grit_out_dir)',
],
- 'export_dependent_settings': [
- 'common/extensions/api/api.gyp:chrome_api',
- ],
'sources': [
'<@(chrome_utility_sources)',
],
'conditions': [
- ['OS=="win" or OS=="mac"', {
- 'dependencies': [
- '../components/components.gyp:wifi_component',
- ],
- 'sources': [
- '<@(chrome_utility_win_mac_media_gallery_sources)',
- ],
- }],
- ['OS=="mac"', {
- 'sources': [
- 'utility/media_galleries/iphoto_library_parser.cc',
- 'utility/media_galleries/iphoto_library_parser.h',
- ],
- }],
['use_openssl==1', {
'sources!': [
'utility/importer/nss_decryptor.cc',
@@ -143,23 +133,42 @@
'utility/importer/nss_decryptor_system_nss.h',
],
}],
- ['OS=="android"', {
- 'sources!': [
- 'utility/profile_import_handler.cc',
- ],
- }, { # !android
+ ['OS!="android"', {
'sources': [
'<@(chrome_utility_importer_sources)',
- '<@(chrome_utility_shared_media_sources)',
],
+ }],
+ ['enable_extensions==1', {
'dependencies': [
'../third_party/libexif/libexif.gyp:libexif',
+ 'common/extensions/api/api.gyp:chrome_api',
+ ],
+ 'export_dependent_settings': [
+ 'common/extensions/api/api.gyp:chrome_api',
],
- }],
- ['OS!="win" and OS!="mac"', {
'sources': [
- 'utility/image_writer/image_writer_stub.cc',
- ]
+ '<@(chrome_utility_extensions_sources)',
+ '<@(chrome_utility_shared_media_sources)',
+ ],
+ 'conditions': [
+ ['OS=="win" or OS=="mac"', {
+ 'dependencies': [
+ '../components/components.gyp:wifi_component',
+ ],
+ 'sources': [
+ '<@(chrome_utility_win_mac_media_gallery_sources)',
+ ],
+ }, { # OS!="win" and OS!="mac"
+ 'sources': [
+ 'utility/image_writer/image_writer_stub.cc',
+ ]
+ }],
+ ['OS=="mac"', {
+ 'sources': [
+ '<@(chrome_utility_mac_media_gallery_sources)',
+ ],
+ }],
+ ],
}],
['enable_printing!=1', {
'sources!': [
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/chrome_utility_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698