diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | chrome/chrome_utility.gypi | 171 | ||||
| -rw-r--r-- | chrome/plugin/BUILD.gn | 18 | ||||
| -rw-r--r-- | chrome/utility/BUILD.gn | 89 | ||||
| -rw-r--r-- | content/child/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/plugin/BUILD.gn | 4 | ||||
| -rw-r--r-- | content/ppapi_plugin/BUILD.gn | 4 | ||||
| -rw-r--r-- | content/worker/BUILD.gn | 4 | ||||
| -rw-r--r-- | ui/compositor/BUILD.gn | 4 | ||||
| -rw-r--r-- | webkit/child/BUILD.gn | 2 | ||||
| -rw-r--r-- | webkit/common/gpu/BUILD.gn | 3 | ||||
| -rw-r--r-- | webkit/common/gpu/webkit_gpu.gyp | 1 |
12 files changed, 214 insertions, 92 deletions
@@ -21,7 +21,9 @@ group("root") { "//cc", "//chrome/common", + "//chrome/plugin", "//chrome/renderer", + "//chrome/utility", "//components:all_components", "//content", "//crypto", @@ -125,7 +127,9 @@ group("root") { deps -= [ "//cc", "//chrome/common", # Blocked on content. + "//chrome/plugin", # Blocked on content. "//chrome/renderer", # Blocked on content. + "//chrome/utility", # Blocked on content. "//content", "//extensions/common/api:extensions_api", "//pdf", # Not compiled on Android in GYP yet, either. diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi index c76986a..b9c8752 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"', { diff --git a/chrome/plugin/BUILD.gn b/chrome/plugin/BUILD.gn new file mode 100644 index 0000000..76e4109 --- /dev/null +++ b/chrome/plugin/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +static_library("plugin") { + sources = [ + "chrome_content_plugin_client.cc", + "chrome_content_plugin_client.h", + ] + + configs += [ "//build/config/compiler:wexit_time_destructors" ] + + deps = [ + "//base", + "//chrome:strings", + "//content/public/plugin", + ] +} diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn new file mode 100644 index 0000000..9eb5cc0 --- /dev/null +++ b/chrome/utility/BUILD.gn @@ -0,0 +1,89 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/crypto.gni") +import("//build/config/features.gni") + +gypi_values = exec_script( + "//build/gypi_to_gn.py", + [ rebase_path("../chrome_utility.gypi") ], + "scope", + [ "../chrome_utility.gypi" ]) + +static_library("utility") { + sources = rebase_path(gypi_values.chrome_utility_sources, ".", "..") + + deps = [ + "//base", + #'../components/components_strings.gyp:components_strings', TODO(GYP) + #'../components/components.gyp:url_fixer', TODO(GYP) + "//content/public/common", + "//content/public/utility", + #'../media/media.gyp:media', TODO(GYP) + "//skia", + "//third_party/libxml", + "//chrome:resources", + "//chrome:strings", + "//chrome/common", + "//chrome/common/extensions/api", + ] + + if (is_win || is_mac) { + sources += rebase_path( + gypi_values.chrome_utility_win_mac_media_gallery_sources, ".", "..") + #deps += [ "//components/wifi" ] TODO(GYP) + } + if (is_mac) { + sources += [ + "media_galleries/iphoto_library_parser.cc", + "media_galleries/iphoto_library_parser.h", + ] + } + + if (is_android) { + sources -= [ "profile_import_handler.cc" ] + } else { + sources += rebase_path(gypi_values.chrome_utility_importer_sources, + ".", "..") + sources += rebase_path(gypi_values.chrome_utility_shared_media_sources, + ".", "..") + #deps += [ "//third_party/libexif" ] TODO(GYP) + } + + if (!use_openssl) { + sources -= [ "importer/nss_decryptor.cc" ] + if (!is_win && !is_mac) { + sources += [ + "importer/nss_decryptor_system_nss.cc", + "importer/nss_decryptor_system_nss.h", + ] + deps += [ + "//crypto", + "//crypto:platform", + ] + } + } + + + if (!is_win && !is_mac) { + sources += [ "image_writer/image_writer_stub.cc" ] + } + if (enable_printing != 1) { + sources -= [ + "printing_handler.cc", + "printing_handler.h", + ] + } + + if (!enable_mdns) { + sources -= [ + "local_discovery/service_discovery_message_handler.cc", + "local_discovery/service_discovery_message_handler.h", + ] + } + + forward_dependent_configs_from = [ + "//chrome/common/extensions/api", + ] +} diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index bf3a43a..63a951a 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -88,7 +88,7 @@ source_set("child") { } else { deps += [ "//crypto:platform", - #"//third_party/WebKit/public:blink", # TODO(GYP) + "//third_party/WebKit/public:blink", "//third_party/npapi", "//webkit:resources", "//webkit:strings", diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn index 6235dbf..a5e6481 100644 --- a/content/plugin/BUILD.gn +++ b/content/plugin/BUILD.gn @@ -32,9 +32,7 @@ if (enable_plugins && !is_linux) { "//mojo/public/interfaces/service_provider", "//skia", "//third_party/npapi", - #"//third_party/WebKit/public:blink", TODO(GYP) - # TODO(GYP) remove this when blink is enabled: - "//third_party/WebKit/public:blink_headers", + "//third_party/WebKit/public:blink", ] } } else { diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn index fae7d1a..b27ae34 100644 --- a/content/ppapi_plugin/BUILD.gn +++ b/content/ppapi_plugin/BUILD.gn @@ -25,9 +25,7 @@ source_set("ppapi_plugin") { "//ppapi:ppapi_ipc", "//skia", "//third_party/icu", - #"//third_party/WebKit/public:blink", TODO(GYP) - # TODO(GYP) remove this when blink is enabled: - "//third_party/WebKit/public:blink_headers", + "//third_party/WebKit/public:blink", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", diff --git a/content/worker/BUILD.gn b/content/worker/BUILD.gn index 23cfcff..3726aa8 100644 --- a/content/worker/BUILD.gn +++ b/content/worker/BUILD.gn @@ -26,9 +26,7 @@ source_set("worker") { "//base", "//mojo/public/interfaces/service_provider", "//skia", - #"//third_party/WebKit/public:blink", TODO(GYP) - # TODO(GYP) remove this when blink is enabled: - "//third_party/WebKit/public:blink_headers", + "//third_party/WebKit/public:blink", ] } diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index 5ad74c9..155818b 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -104,12 +104,12 @@ source_set("test_support") { "//cc:test_support", "//skia", "//testing/gtest", - #"//third_party/WebKit/public:blink_minimal", TODO(GYP) + "//third_party/WebKit/public:blink_minimal", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", "//ui/gl", - #'<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', TODO(GYP) + "//webkit/common/gpu", ] if (use_x11) { diff --git a/webkit/child/BUILD.gn b/webkit/child/BUILD.gn index f0c3626..c2a1dc3 100644 --- a/webkit/child/BUILD.gn +++ b/webkit/child/BUILD.gn @@ -39,7 +39,7 @@ component("child") { "//base/third_party/dynamic_annotations", "//net", "//skia", - #"//third_party/WebKit/public:blink", TODO(GYP) + "//third_party/WebKit/public:blink", "//ui/gfx", "//ui/gfx/geometry", "//ui/native_theme", diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn index 862d4b5..cecbd9d 100644 --- a/webkit/common/gpu/BUILD.gn +++ b/webkit/common/gpu/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# GYP version: webkit/common/gpu/webkit_gpu.gyp:webkit_gpu component("gpu") { output_name = "webkit_gpu" @@ -35,7 +36,7 @@ component("gpu") { "//gpu/command_buffer/client:gl_in_process_context", "//gpu/skia_bindings", "//skia", - #"//third_party/WebKit/public:blink_minimal", TODO(GYP) + "//third_party/WebKit/public:blink_minimal", "//third_party/angle:translator", "//ui/gl", "//ui/gfx", diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index 23b36e5..7388e18 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -10,6 +10,7 @@ ['OS != "ios"', { 'targets': [ { + # GN version: //webkit/common/gpu 'target_name': 'webkit_gpu', 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1, }, |