Index: chrome/chrome_utility.gypi |
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi |
index c76986acb3a99114820f73f28cbd7730ed0a0bd4..b9c8752a1a332de35d76a36cd8dc4c13ea72f53c 100644 |
--- a/chrome/chrome_utility.gypi |
+++ b/chrome/chrome_utility.gypi |
@@ -3,8 +3,90 @@ |
# found in the LICENSE file. |
{ |
+ 'variables': { |
+ 'chrome_utility_sources': [ |
+ 'utility/chrome_content_utility_client.cc', |
+ 'utility/chrome_content_utility_client.h', |
+ 'utility/chrome_content_utility_ipc_whitelist.cc', |
+ 'utility/chrome_content_utility_ipc_whitelist.h', |
+ 'utility/cloud_print/bitmap_image.cc', |
+ 'utility/cloud_print/bitmap_image.h', |
+ 'utility/cloud_print/pwg_encoder.cc', |
+ 'utility/cloud_print/pwg_encoder.h', |
+ 'utility/extensions/unpacker.cc', |
+ 'utility/extensions/unpacker.h', |
+ 'utility/image_writer/disk_unmounter_mac.cc', |
+ 'utility/image_writer/disk_unmounter_mac.h', |
+ 'utility/image_writer/error_messages.cc', |
+ 'utility/image_writer/error_messages.h', |
+ 'utility/image_writer/image_writer.cc', |
+ 'utility/image_writer/image_writer.h', |
+ 'utility/image_writer/image_writer_handler.cc', |
+ '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', |
+ 'utility/importer/bookmark_html_reader.h', |
+ 'utility/importer/bookmarks_file_importer.cc', |
+ 'utility/importer/bookmarks_file_importer.h', |
+ 'utility/importer/external_process_importer_bridge.cc', |
+ 'utility/importer/external_process_importer_bridge.h', |
+ 'utility/importer/favicon_reencode.cc', |
+ 'utility/importer/favicon_reencode.h', |
+ 'utility/importer/firefox_importer.cc', |
+ 'utility/importer/firefox_importer.h', |
+ 'utility/importer/ie_importer_win.cc', |
+ 'utility/importer/ie_importer_win.h', |
+ 'utility/importer/importer.cc', |
+ 'utility/importer/importer.h', |
+ 'utility/importer/importer_creator.cc', |
+ 'utility/importer/importer_creator.h', |
+ 'utility/importer/nss_decryptor.cc', |
+ 'utility/importer/nss_decryptor.h', |
+ 'utility/importer/nss_decryptor_mac.h', |
+ 'utility/importer/nss_decryptor_mac.mm', |
+ 'utility/importer/nss_decryptor_win.cc', |
+ 'utility/importer/nss_decryptor_win.h', |
+ 'utility/importer/safari_importer.h', |
+ 'utility/importer/safari_importer.mm', |
+ ], |
+ 'chrome_utility_shared_media_sources': [ |
+ 'utility/media_galleries/image_metadata_extractor.cc', |
+ 'utility/media_galleries/image_metadata_extractor.h', |
+ 'utility/media_galleries/ipc_data_source.cc', |
+ 'utility/media_galleries/ipc_data_source.h', |
+ 'utility/media_galleries/itunes_pref_parser_win.cc', |
+ 'utility/media_galleries/itunes_pref_parser_win.h', |
+ 'utility/media_galleries/media_metadata_parser.cc', |
+ 'utility/media_galleries/media_metadata_parser.h', |
+ ], |
+ 'chrome_utility_win_mac_media_gallery_sources': [ |
+ 'utility/media_galleries/iapps_xml_utils.cc', |
+ 'utility/media_galleries/iapps_xml_utils.h', |
+ 'utility/media_galleries/itunes_library_parser.cc', |
+ 'utility/media_galleries/itunes_library_parser.h', |
+ 'utility/media_galleries/picasa_album_table_reader.cc', |
+ 'utility/media_galleries/picasa_album_table_reader.h', |
+ 'utility/media_galleries/picasa_albums_indexer.cc', |
+ 'utility/media_galleries/picasa_albums_indexer.h', |
+ 'utility/media_galleries/pmp_column_reader.cc', |
+ 'utility/media_galleries/pmp_column_reader.h', |
+ ], |
+ }, |
'targets': [ |
{ |
+ # GN version: //chrome/utility |
'target_name': 'utility', |
'type': 'static_library', |
'variables': { 'enable_wexit_time_destructors': 1, }, |
@@ -16,7 +98,6 @@ |
'../content/content.gyp:content_utility', |
'../media/media.gyp:media', |
'../skia/skia.gyp:skia', |
- '../third_party/libexif/libexif.gyp:libexif', |
'../third_party/libxml/libxml.gyp:libxml', |
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', |
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', |
@@ -31,67 +112,7 @@ |
'common/extensions/api/api.gyp:chrome_api', |
], |
'sources': [ |
- 'utility/chrome_content_utility_client.cc', |
- 'utility/chrome_content_utility_client.h', |
- 'utility/chrome_content_utility_ipc_whitelist.cc', |
- 'utility/chrome_content_utility_ipc_whitelist.h', |
- 'utility/cloud_print/bitmap_image.cc', |
- 'utility/cloud_print/bitmap_image.h', |
- 'utility/cloud_print/pwg_encoder.cc', |
- 'utility/cloud_print/pwg_encoder.h', |
- 'utility/extensions/unpacker.cc', |
- 'utility/extensions/unpacker.h', |
- 'utility/image_writer/disk_unmounter_mac.cc', |
- 'utility/image_writer/disk_unmounter_mac.h', |
- 'utility/image_writer/error_messages.cc', |
- 'utility/image_writer/error_messages.h', |
- 'utility/image_writer/image_writer.cc', |
- 'utility/image_writer/image_writer.h', |
- 'utility/image_writer/image_writer_handler.cc', |
- 'utility/image_writer/image_writer_handler.h', |
- 'utility/image_writer/image_writer_mac.cc', |
- 'utility/image_writer/image_writer_win.cc', |
- 'utility/importer/bookmark_html_reader.cc', |
- 'utility/importer/bookmark_html_reader.h', |
- 'utility/importer/bookmarks_file_importer.cc', |
- 'utility/importer/bookmarks_file_importer.h', |
- 'utility/importer/external_process_importer_bridge.cc', |
- 'utility/importer/external_process_importer_bridge.h', |
- 'utility/importer/favicon_reencode.cc', |
- 'utility/importer/favicon_reencode.h', |
- 'utility/importer/firefox_importer.cc', |
- 'utility/importer/firefox_importer.h', |
- 'utility/importer/ie_importer_win.cc', |
- 'utility/importer/ie_importer_win.h', |
- 'utility/importer/importer.cc', |
- 'utility/importer/importer.h', |
- 'utility/importer/importer_creator.cc', |
- 'utility/importer/importer_creator.h', |
- 'utility/importer/nss_decryptor.cc', |
- 'utility/importer/nss_decryptor.h', |
- 'utility/importer/nss_decryptor_mac.h', |
- 'utility/importer/nss_decryptor_mac.mm', |
- 'utility/importer/nss_decryptor_win.cc', |
- 'utility/importer/nss_decryptor_win.h', |
- 'utility/importer/safari_importer.h', |
- 'utility/importer/safari_importer.mm', |
- 'utility/local_discovery/service_discovery_message_handler.cc', |
- 'utility/local_discovery/service_discovery_message_handler.h', |
- 'utility/media_galleries/image_metadata_extractor.cc', |
- 'utility/media_galleries/image_metadata_extractor.h', |
- 'utility/media_galleries/ipc_data_source.cc', |
- 'utility/media_galleries/ipc_data_source.h', |
- 'utility/media_galleries/itunes_pref_parser_win.cc', |
- 'utility/media_galleries/itunes_pref_parser_win.h', |
- 'utility/media_galleries/media_metadata_parser.cc', |
- 'utility/media_galleries/media_metadata_parser.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_sources)', |
], |
'conditions': [ |
['OS=="win" or OS=="mac"', { |
@@ -99,16 +120,7 @@ |
'../components/components.gyp:wifi_component', |
], |
'sources': [ |
- 'utility/media_galleries/iapps_xml_utils.cc', |
- 'utility/media_galleries/iapps_xml_utils.h', |
- 'utility/media_galleries/itunes_library_parser.cc', |
- 'utility/media_galleries/itunes_library_parser.h', |
- 'utility/media_galleries/picasa_album_table_reader.cc', |
- 'utility/media_galleries/picasa_album_table_reader.h', |
- 'utility/media_galleries/picasa_albums_indexer.cc', |
- 'utility/media_galleries/picasa_albums_indexer.h', |
- 'utility/media_galleries/pmp_column_reader.cc', |
- 'utility/media_galleries/pmp_column_reader.h', |
+ '<@(chrome_utility_win_mac_media_gallery_sources)', |
], |
}], |
['OS=="mac"', { |
@@ -132,13 +144,16 @@ |
], |
}], |
['OS=="android"', { |
- 'dependencies!': [ |
- '../third_party/libexif/libexif.gyp:libexif', |
+ 'sources!': [ |
+ 'utility/profile_import_handler.cc', |
+ ], |
+ }, { # !android |
+ 'sources': [ |
+ '<@(chrome_utility_importer_sources)', |
+ '<@(chrome_utility_shared_media_sources)', |
], |
- 'sources/': [ |
- ['exclude', '^utility/importer/'], |
- ['exclude', '^utility/media_galleries/'], |
- ['exclude', '^utility/profile_import_handler\.cc'], |
+ 'dependencies': [ |
+ '../third_party/libexif/libexif.gyp:libexif', |
], |
}], |
['OS!="win" and OS!="mac"', { |