diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-08-26 12:05:21 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-08-26 19:08:09 +0000 |
| commit | 64275214e0ab409050f048cb7e4b4cf30e3df082 (patch) | |
| tree | 3efe516b53bfea848a919f7adb49494743c2410f | |
| parent | 3f2fc908707451c46d322bcea57f8978ea68fdac (diff) | |
| download | chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.zip chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.tar.gz chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.tar.bz2 | |
Work on GN build of Chrome.
Fixes the rest of the non-rtc and non-vpx linker errors for the chrome target.
BUG=
R=ajwong@chromium.org
Review URL: https://codereview.chromium.org/505853003
Cr-Commit-Position: refs/heads/master@{#291952}
28 files changed, 197 insertions, 28 deletions
diff --git a/apps/BUILD.gn b/apps/BUILD.gn index 16d4138..0a80d8c 100644 --- a/apps/BUILD.gn +++ b/apps/BUILD.gn @@ -49,6 +49,7 @@ static_library("apps") { "//chrome/app/theme:theme_resources", "//chrome/browser/extensions", "//chrome/common/extensions/api:api", + "//components/web_modal", "//skia", ] diff --git a/base/BUILD.gn b/base/BUILD.gn index e65a277..3f04f63 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -475,6 +475,7 @@ component("base") { "process/process_handle_posix.cc", "process/process_handle_win.cc", "process/process_info.h", + "process/process_info_linux.cc", "process/process_info_mac.cc", "process/process_info_win.cc", "process/process_iterator.cc", diff --git a/build/config/features.gni b/build/config/features.gni index a618825..5970a72 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -164,3 +164,8 @@ enable_chromevox_next = false # Use brlapi from brltty for braille display support. use_brlapi = is_chromeos + +# Option controlling the use of GConf (the classic GNOME configuration +# system). +# TODO(GYP) also require !embedded to enable. +use_gconf = is_linux && !is_chromeos diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn index f26b5101..ed13b18 100644 --- a/build/config/linux/BUILD.gn +++ b/build/config/linux/BUILD.gn @@ -39,6 +39,10 @@ pkg_config("gtk") { packages = [ "gmodule-2.0", "gtk+-2.0", "gthread-2.0" ] } +pkg_config("gtkprint") { + packages = [ "gtk+-unix-print-2.0" ] +} + pkg_config("pangocairo") { packages = [ "pangocairo" ] } diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index f170292..d2bbd09 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -291,7 +291,7 @@ static_library("browser") { ".", "//chrome") } else { # Non-mobile deps += [ - #"policy_path_parser", TODO(GYP) + "//chrome/browser/policy:path_parser", ] } } else { diff --git a/chrome/browser/policy/BUILD.gn b/chrome/browser/policy/BUILD.gn new file mode 100644 index 0000000..6a645e7 --- /dev/null +++ b/chrome/browser/policy/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("path_parser") { + sources = [ + "policy_path_parser.h", + "policy_path_parser_linux.cc", + "policy_path_parser_mac.mm", + "policy_path_parser_win.cc", + ] + + deps = [ + "//base", + "//chrome/common:constants", + "//components/policy", + ] +} diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 2ca9668..6a7b936 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -216,10 +216,10 @@ static_library("ui") { } if (use_aura && !use_ozone && is_desktop_linux) { deps += [ + "//build/config/linux:gio", # gtk2 is the only component that can interact with gtk2 in our new # world. - #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP) - "//build/config/linux:gio", + "//chrome/browser/ui/libgtk2ui", ] } if (is_win || is_mac || is_desktop_linux) { diff --git a/chrome/browser/ui/libgtk2ui/BUILD.gn b/chrome/browser/ui/libgtk2ui/BUILD.gn new file mode 100644 index 0000000..6fc67c1 --- /dev/null +++ b/chrome/browser/ui/libgtk2ui/BUILD.gn @@ -0,0 +1,94 @@ +# 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. + +assert(is_linux, "This file should only be referenced on Linux") + +import("//build/config/features.gni") + +component("libgtk2ui") { + sources = [ + "app_indicator_icon.cc", + "app_indicator_icon.h", + "app_indicator_icon_menu.cc", + "app_indicator_icon_menu.h", + "chrome_gtk_frame.cc", + "chrome_gtk_frame.h", + "chrome_gtk_menu_subclasses.cc", + "chrome_gtk_menu_subclasses.h", + "g_object_destructor_filo.cc", + "g_object_destructor_filo.h", + "gtk2_border.cc", + "gtk2_border.h", + "gtk2_event_loop.cc", + "gtk2_event_loop.h", + "gtk2_key_bindings_handler.cc", + "gtk2_key_bindings_handler.h", + "gtk2_signal_registrar.cc", + "gtk2_signal_registrar.h", + "gtk2_status_icon.cc", + "gtk2_status_icon.h", + "gtk2_ui.cc", + "gtk2_ui.h", + "gtk2_util.cc", + "gtk2_util.h", + "libgtk2ui_export.h", + "menu_util.cc", + "menu_util.h", + "native_theme_gtk2.cc", + "native_theme_gtk2.h", + "owned_widget_gtk2.cc", + "owned_widget_gtk2.h", + "print_dialog_gtk2.cc", + "print_dialog_gtk2.h", + "printing_gtk2_util.cc", + "printing_gtk2_util.h", + "select_file_dialog_impl.cc", + "select_file_dialog_impl.h", + "select_file_dialog_impl_gtk2.cc", + "select_file_dialog_impl_kde.cc", + "skia_utils_gtk2.cc", + "skia_utils_gtk2.h", + "unity_service.cc", + "unity_service.h", + "x11_input_method_context_impl_gtk2.cc", + "x11_input_method_context_impl_gtk2.h", + ] + + if (use_gconf) { + sources += [ + "gconf_listener.cc", + "gconf_listener.h", + ] + } + if (is_clang) { + # G_DEFINE_TYPE automatically generates a *get_instance_private inline + # function after glib 2.37. That's unused. Prevent to complain about it. + cflags = [ "-Wno-unused-function" ] + } + + defines = [ "LIBGTK2UI_IMPLEMENTATION" ] + + configs += [ + "//build/config/linux:gconf", + "//build/config/linux:gtk", + "//build/config/linux:gtkprint", + "//printing:cups", + ] + + deps = [ + "//base", + "//base:i18n", + "//base/third_party/dynamic_annotations", + "//chrome/app/theme:theme_resources", + "//chrome:extra_resources", + "//chrome:resources", + "//chrome:strings", + "//components/resources", + "//skia", + "//ui/base", + "//ui/resources", + "//ui/strings", + "//ui/views", + ] +} diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp index 1809ae8..ffe341e 100644 --- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp +++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp @@ -8,6 +8,7 @@ }, 'targets': [ { + # GN version: //chrome/browser/ui/libgtk2ui 'target_name': 'gtk2ui', 'type': '<(component)', 'dependencies': [ @@ -38,6 +39,7 @@ # the normal, global gtk exclusion rules, as we are otherwise using gtk # in a non-gtk build. 'sources': [ + # Note: sources list duplicated in GN build. 'app_indicator_icon.cc', 'app_indicator_icon.h', 'app_indicator_icon_menu.cc', diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index b99d3b0..45710c0 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -208,7 +208,7 @@ static_library("common") { } if (enable_remoting) { - #deps += [ '../remoting/remoting.gyp:remoting_client_plugin' ] TODO(GYP) + deps += [ "//remoting/client/plugin" ] } if (enable_plugins) { deps += [ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index c1d9e42..33bb0fe 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -41,6 +41,7 @@ static_library("renderer") { "//components/password_manager/content/renderer", "//components/plugins/renderer", "//components/startup_metric_utils", + "//components/translate/content/renderer", "//components/translate/core/common", "//components/translate/core/language_detection", "//components/visitedlink/renderer", diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn index 9a1ab9d..fedccad 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -34,7 +34,7 @@ static_library("utility") { ".", "..") } - if (enable_extensions == 1) { + if (enable_extensions) { deps += [ "//chrome/common/extensions/api", #"//third_party/libexif", TODO(GYP) @@ -63,8 +63,11 @@ static_library("utility") { } } - if (!use_openssl) { - sources -= [ "importer/nss_decryptor.cc" ] + if (use_openssl) { + if (!is_win && !is_mac) { + sources -= [ "importer/nss_decryptor.cc" ] + } + } else { # !use_openssl if (!is_win && !is_mac) { sources += [ "importer/nss_decryptor_system_nss.cc", diff --git a/components/copresence.gypi b/components/copresence.gypi index 6a27d76..6ecd700 100644 --- a/components/copresence.gypi +++ b/components/copresence.gypi @@ -19,6 +19,7 @@ '..', ], 'sources': [ + # Note: sources list duplicated in GN build. 'copresence/copresence_constants.cc', 'copresence/copresence_manager.cc', 'copresence/copresence_manager_impl.cc', diff --git a/components/copresence/BUILD.gn b/components/copresence/BUILD.gn index abaf920..d19aca1 100644 --- a/components/copresence/BUILD.gn +++ b/components/copresence/BUILD.gn @@ -7,6 +7,8 @@ static_library("copresence") { "copresence_constants.cc", "copresence_manager.cc", "copresence_manager_impl.cc", + "copresence_switches.cc", + "copresence_switches.h", "handlers/audio/audio_directive_handler.cc", "handlers/audio/audio_directive_handler.h", "handlers/audio/audio_directive_list.cc", diff --git a/components/data_reduction_proxy/browser/BUILD.gn b/components/data_reduction_proxy/browser/BUILD.gn index d8e755d..d00e084 100644 --- a/components/data_reduction_proxy/browser/BUILD.gn +++ b/components/data_reduction_proxy/browser/BUILD.gn @@ -19,6 +19,8 @@ static_library("browser") { "data_reduction_proxy_protocol.h", "data_reduction_proxy_settings.cc", "data_reduction_proxy_settings.h", + "data_reduction_proxy_tamper_detection.cc", + "data_reduction_proxy_tamper_detection.h", "data_reduction_proxy_usage_stats.cc", "data_reduction_proxy_usage_stats.h", ] diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn index 1e10d5f..b521a1f 100644 --- a/components/password_manager/core/browser/BUILD.gn +++ b/components/password_manager/core/browser/BUILD.gn @@ -52,6 +52,11 @@ static_library("browser") { "password_store_sync.h", "psl_matching_helper.cc", "psl_matching_helper.h", + "webdata/logins_table.cc", + "webdata/logins_table.h", + "webdata/logins_table_win.cc", + "webdata/password_web_data_service_win.cc", + "webdata/password_web_data_service_win.h", ] deps = [ diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn index 6ec8324..92a67b0 100644 --- a/components/signin/core/browser/BUILD.gn +++ b/components/signin/core/browser/BUILD.gn @@ -10,6 +10,8 @@ static_library("browser") { "account_reconcilor.h", "account_service_flag_fetcher.cc", "account_service_flag_fetcher.h", + "account_tracker_service.cc", + "account_tracker_service.h", "mutable_profile_oauth2_token_service.cc", "mutable_profile_oauth2_token_service.h", "profile_oauth2_token_service.cc", diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn index 5faca5bc..13728f4 100644 --- a/components/translate/core/browser/BUILD.gn +++ b/components/translate/core/browser/BUILD.gn @@ -6,6 +6,8 @@ source_set("browser") { sources = [ "language_state.cc", "language_state.h", + "options_menu_model.cc", + "options_menu_model.h", "page_translated_details.h", "translate_accept_languages.cc", "translate_accept_languages.h", @@ -18,6 +20,8 @@ source_set("browser") { "translate_error_details.h", "translate_event_details.cc", "translate_event_details.h", + "translate_infobar_delegate.cc", + "translate_infobar_delegate.h", "translate_language_list.cc", "translate_language_list.h", "translate_manager.cc", @@ -26,6 +30,9 @@ source_set("browser") { "translate_prefs.h", "translate_script.cc", "translate_script.h", + "translate_step.h", + "translate_ui_delegate.cc", + "translate_ui_delegate.h", "translate_url_fetcher.cc", "translate_url_fetcher.h", "translate_url_util.cc", @@ -36,8 +43,10 @@ source_set("browser") { "//base", "//components/language_usage_metrics", "//components/resources:components_resources", + "//components/strings", "//components/translate/core/common", "//net", + "//third_party/icu", "//ui/base", "//url", ] diff --git a/components/usb_service/BUILD.gn b/components/usb_service/BUILD.gn index 6439d05..bb3ada5 100644 --- a/components/usb_service/BUILD.gn +++ b/components/usb_service/BUILD.gn @@ -9,6 +9,8 @@ component("usb_service") { "usb_device_impl.cc", "usb_device_impl.h", "usb_device.h", + "usb_device_filter.cc", + "usb_device_filter.h", "usb_device_handle_impl.cc", "usb_device_handle_impl.h", "usb_device_handle.h", diff --git a/components/web_modal/BUILD.gn b/components/web_modal/BUILD.gn index f603fdd..b7bffe7 100644 --- a/components/web_modal/BUILD.gn +++ b/components/web_modal/BUILD.gn @@ -7,6 +7,9 @@ static_library("web_modal") { "modal_dialog_host.cc", "modal_dialog_host.h", "native_web_contents_modal_dialog.h", + "popup_manager.cc", + "popup_manager.h", + "single_popup_manager.h", "single_web_contents_dialog_manager.h", "web_contents_modal_dialog_host.cc", "web_contents_modal_dialog_host.h", diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn index c5efacc..73f3690 100644 --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn @@ -125,6 +125,8 @@ source_set("browser") { "api/usb/usb_api.h", "api/usb/usb_device_resource.cc", "api/usb/usb_device_resource.h", + "api/usb_private/usb_private_api.cc", + "api/usb_private/usb_private_api.h", "api_activity_monitor.h", "app_sorting.h", "app_window/app_delegate.h", @@ -217,6 +219,12 @@ source_set("browser") { "file_reader.h", "granted_file_entry.cc", "granted_file_entry.h", + "guest_view/app_view/app_view_constants.cc", + "guest_view/app_view/app_view_constants.h", + "guest_view/app_view/app_view_guest.cc", + "guest_view/app_view/app_view_guest.h", + "guest_view/app_view/app_view_guest_delegate.cc", + "guest_view/app_view/app_view_guest_delegate.h", "guest_view/guest_view_base.cc", "guest_view/guest_view_base.h", "guest_view/guest_view_constants.cc", @@ -225,16 +233,10 @@ source_set("browser") { "guest_view/guest_view_manager.cc", "guest_view/guest_view_manager.h", "guest_view/guest_view.h", - "guest_view/app_view/app_view_constants.cc", - "guest_view/app_view/app_view_constants.h", - "guest_view/app_view/app_view_guest.cc", - "guest_view/app_view/app_view_guest.h", - "guest_view/app_view/app_view_guest_delegate.cc", - "guest_view/app_view/app_view_guest_delegate.h", - "guest_view/web_view/web_view_permission_helper_delegate.cc", - "guest_view/web_view/web_view_permission_helper_delegate.h", "guest_view/web_view/web_view_guest_delegate.cc", "guest_view/web_view/web_view_guest_delegate.h", + "guest_view/web_view/web_view_permission_helper_delegate.cc", + "guest_view/web_view/web_view_permission_helper_delegate.h", "image_loader.cc", "image_loader.h", "image_loader_factory.cc", diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index 5ce44df..ab22d4c 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -165,6 +165,8 @@ source_set("common") { "stack_frame.h", "switches.cc", "switches.h", + "update_manifest.cc", + "update_manifest.h", "url_pattern.cc", "url_pattern.h", "url_pattern_set.cc", @@ -191,6 +193,7 @@ source_set("common") { "//ipc", "//net", "//third_party/icu", + "//third_party/libxml", "//third_party/re2", "//ui/base", "//ui/gfx/geometry", diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index ee6fc90..f43aa10 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -36,6 +36,7 @@ '<(INTERMEDIATE_DIR)', ], 'sources': [ + # Note: sources list duplicated in GN build. 'common/api/messaging/message.h', 'common/api/sockets/sockets_manifest_data.cc', 'common/api/sockets/sockets_manifest_data.h', @@ -196,12 +197,12 @@ 'common/stack_frame.h', 'common/switches.cc', 'common/switches.h', + 'common/update_manifest.cc', + 'common/update_manifest.h', 'common/url_pattern.cc', 'common/url_pattern.h', 'common/url_pattern_set.cc', 'common/url_pattern_set.h', - 'common/update_manifest.cc', - 'common/update_manifest.h', 'common/user_script.cc', 'common/user_script.h', 'common/value_counter.cc', @@ -609,6 +610,7 @@ '..', ], 'sources': [ + # Note: sources list duplicated in GN build. 'renderer/activity_log_converter_strategy.cc', 'renderer/activity_log_converter_strategy.h', 'renderer/api_activity_logger.cc', diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index 562b40c..8128b34 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -38,9 +38,13 @@ source_set("renderer") { "event_bindings.h", "extension_helper.cc", "extension_helper.h", + "extensions_render_frame_observer.cc", + "extensions_render_frame_observer.h", "extensions_renderer_client.cc", "extensions_renderer_client.h", "extension_groups.h", + "guest_view/guest_view_internal_custom_bindings.cc", + "guest_view/guest_view_internal_custom_bindings.h", "file_system_natives.cc", "file_system_natives.h", "i18n_custom_bindings.cc", diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn index e6ac957..6c928c04 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -88,6 +88,12 @@ source_set("audio") { "scoped_task_runner_observer.h", "simple_sources.cc", "simple_sources.h", + "sounds/audio_stream_handler.cc", + "sounds/audio_stream_handler.h", + "sounds/sounds_manager.cc", + "sounds/sounds_manager.h", + "sounds/wav_audio_handler.cc", + "sounds/wav_audio_handler.h", "virtual_audio_input_stream.cc", "virtual_audio_input_stream.h", "virtual_audio_output_stream.cc", @@ -97,17 +103,6 @@ source_set("audio") { libs = [] configs += [ "//media:media_config" ] - if (is_chromeos) { - sources += [ - "sounds/audio_stream_handler.cc", - "sounds/audio_stream_handler.h", - "sounds/sounds_manager.cc", - "sounds/sounds_manager.h", - "sounds/wav_audio_handler.cc", - "sounds/wav_audio_handler.h", - ] - } - if (is_mac) { sources += [ "mac/audio_auhal_mac.cc", diff --git a/printing/printing.gyp b/printing/printing.gyp index 7ab3c09..c9106f4 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -254,6 +254,7 @@ 'msvs_disabled_warnings': [ 4267, ], }, { + # GN version: //printing:cups (config, not a target). 'target_name': 'cups', 'type': 'none', 'conditions': [ diff --git a/third_party/libusb/BUILD.gn b/third_party/libusb/BUILD.gn index 27761ef..bcc3845 100644 --- a/third_party/libusb/BUILD.gn +++ b/third_party/libusb/BUILD.gn @@ -36,6 +36,7 @@ static_library("libusb") { "src/libusb/os/windows_common.h", "src/libusb/os/windows_usb.c", "src/libusb/os/windows_usb.h", + "src/libusb/strerror.c", "src/libusb/sync.c", "src/libusb/version.h", "src/libusb/version_nano.h", diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 8599c96..253ccea 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -290,10 +290,16 @@ component("base") { "//third_party/icu", "//ui/events/platform", "//ui/events:events_base", + "//ui/gfx", + "//ui/gfx/geometry", "//ui/resources", "//ui/strings", "//url", ] + # We expose these things in our headers: + forward_dependent_configs_from = [ + "//ui/gfx", + ] if (is_ios) { sources += [ |