| Index: chrome/chrome_utility.gypi
|
| diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
|
| index c76986acb3a99114820f73f28cbd7730ed0a0bd4..47c734a17be936c40756854ceeced9d2694996f1 100644
|
| --- a/chrome/chrome_utility.gypi
|
| +++ b/chrome/chrome_utility.gypi
|
| @@ -39,6 +39,8 @@
|
| 'utility/cloud_print/bitmap_image.h',
|
| 'utility/cloud_print/pwg_encoder.cc',
|
| 'utility/cloud_print/pwg_encoder.h',
|
| + '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',
|
| @@ -94,29 +96,6 @@
|
| 'utility/web_resource_unpacker.h',
|
| ],
|
| 'conditions': [
|
| - ['OS=="win" or OS=="mac"', {
|
| - 'dependencies': [
|
| - '../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',
|
| - ],
|
| - }],
|
| - ['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',
|
| @@ -132,19 +111,57 @@
|
| ],
|
| }],
|
| ['OS=="android"', {
|
| + 'sources/': [
|
| + ['exclude', '^utility/profile_import_handler\.cc'],
|
| + ],
|
| + }],
|
| + ['enable_extensions==1', {
|
| + 'conditions': [
|
| + ['OS=="win" or OS=="mac"', {
|
| + 'dependencies': [
|
| + '../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',
|
| + ],
|
| + }],
|
| + ['OS=="mac"', {
|
| + 'sources': [
|
| + 'utility/media_galleries/iphoto_library_parser.cc',
|
| + 'utility/media_galleries/iphoto_library_parser.h',
|
| + ],
|
| + }],
|
| + ['OS!="win" and OS!="mac"', {
|
| + 'sources': [
|
| + 'utility/image_writer/image_writer_stub.cc',
|
| + ],
|
| + }],
|
| + ],
|
| + }, {
|
| 'dependencies!': [
|
| + 'common/extensions/api/api.gyp:chrome_api',
|
| '../third_party/libexif/libexif.gyp:libexif',
|
| ],
|
| + 'export_dependent_settings!': [
|
| + 'common/extensions/api/api.gyp:chrome_api',
|
| + ],
|
| 'sources/': [
|
| + ['exclude', '^utility/extensions/'],
|
| + ['exclude', '^utility/image_writer/'],
|
| ['exclude', '^utility/importer/'],
|
| ['exclude', '^utility/media_galleries/'],
|
| - ['exclude', '^utility/profile_import_handler\.cc'],
|
| ],
|
| - }],
|
| - ['OS!="win" and OS!="mac"', {
|
| - 'sources': [
|
| - 'utility/image_writer/image_writer_stub.cc',
|
| - ]
|
| + 'sources!': [
|
| + ],
|
| }],
|
| ['enable_printing!=1', {
|
| 'sources!': [
|
|
|