Skip to content

GitLab

T
tangled
Commit 743530fb authored by brettw@chromium.org's avatar brettw@chromium.org
Browse files
Options

More work on content/browser GN build. 

Still not hooked up and not quite everything compiles but this should be the bulk of the functionality.

BUG=
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/328313003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276774 0039d316-1c4b-4281-b951-d872f2087c98
parent 5c10cca4
Hide whitespace changes
Inline Side-by-side
Showing with 479 additions and 494 deletions
build/config/features.gni
View file @ 743530fb
...@@ -63,3 +63,10 @@ enable_notifications = !is_android ...@@ -63,3 +63,10 @@ enable_notifications = !is_android
# TODO(brettw) this should be moved to net and only dependents get this define. # TODO(brettw) this should be moved to net and only dependents get this define.
disable_ftp_support = is_ios disable_ftp_support = is_ios
# Speech input is compiled in by default. Set to 0 to disable.
# TODO(tommyw): Speech Input doesn't exist anymore. Clarify the scope
# of this flag (and probably rename it).
enable_speech_input = true
use_dbus = is_linux
build/config/linux/BUILD.gn
View file @ 743530fb
...@@ -49,6 +49,8 @@ pkg_config("udev") { ...@@ -49,6 +49,8 @@ pkg_config("udev") {
packages = [ "libudev" ] packages = [ "libudev" ]
} }
# Note: if your target also depends on //dbus, you don't need to add this
# config (it will get added automatically if you depend on //dbus).
pkg_config("dbus") { pkg_config("dbus") {
packages = [ "dbus-1" ] packages = [ "dbus-1" ]
} }
...@@ -157,8 +159,7 @@ generate_library_loader("gio") { ...@@ -157,8 +159,7 @@ generate_library_loader("gio") {
name = "LibGioLoader" name = "LibGioLoader"
output_h = "libgio.h" output_h = "libgio.h"
output_cc = "libgio_loader.cc" output_cc = "libgio_loader.cc"
# TODO(brettw) convert ti "<gio/gio.h>" once GN doesn't mangle <>. header = "<gio/gio.h>"
header = "\"gio/gio.h\""
config = ":gio_config" config = ":gio_config"
functions = [ functions = [
...@@ -185,8 +186,7 @@ generate_library_loader("libpci") { ...@@ -185,8 +186,7 @@ generate_library_loader("libpci") {
name = "LibPciLoader" name = "LibPciLoader"
output_h = "libpci.h" output_h = "libpci.h"
output_cc = "libpci_loader.cc" output_cc = "libpci_loader.cc"
# TODO(brettw) convert to "<pci/pci.h>" once GN doesn't mangle <>. header = "<pci/pci.h>"
header = "\"pci/pci.h\""
config = ":libpci_config" config = ":libpci_config"
functions = [ functions = [
......
chromeos/BUILD.gn 0 → 100644
View file @ 743530fb
# 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("//third_party/protobuf/proto_library.gni")
proto_library("power_manager_proto") {
sources = [
"//third_party/cros_system_api/dbus/power_manager/input_event.proto",
"//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.proto",
"//third_party/cros_system_api/dbus/power_manager/policy.proto",
"//third_party/cros_system_api/dbus/power_manager/power_supply_properties.proto",
"//third_party/cros_system_api/dbus/power_manager/suspend.proto",
]
proto_in_dir = "//third_party/cros_system_api/dbus/power_manager"
proto_out_dir = "chromeos/dbus/power_manager"
}
content/browser/BUILD.gn
View file @ 743530fb
...@@ -10,45 +10,21 @@ source_set("browser") { ...@@ -10,45 +10,21 @@ source_set("browser") {
# Only targets in the content tree can depend directly on this target. # Only targets in the content tree can depend directly on this target.
visibility = [ "//content/*" ] visibility = [ "//content/*" ]
sources = rebase_path(content_browser_gypi_values.private_browser_sources, defines = []
".", "//content") libs = []
ldflags = []
# TODO(GYP) these generated files are listed as sources in content_browser.
# This is a bit suspicious. The GN grit template will make a source set # Shared deps. See also non-iOS deps below.
# containing the generated code so it should be sufficient to just depend
# on the grit rule. But maybe some of these will need to be added?
#
# Need this annoying rebase_path call to match what happened with the sources.
sources -= rebase_path([
"$root_gen_dir/webkit/grit/devtools_resources.h",
"$root_gen_dir/webkit/grit/devtools_resources_map.cc",
"$root_gen_dir/webkit/grit/devtools_resources_map.h",
"$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
"$root_gen_dir/ui/ui_resources/grit/webui_resources_map.cc",
"$root_gen_dir/content/browser/devtools/devtools_protocol_constants.cc",
"$root_gen_dir/content/browser/devtools/devtools_protocol_constants.h",
], ".")
configs += [ "//content:content_implementation" ]
deps = [ deps = [
"//base", "//base",
"//cc",
"//content:resources", "//content:resources",
"//content/browser/devtools:resources",
"//content/browser/service_worker:database_proto", "//content/browser/service_worker:database_proto",
"//content/browser/speech/proto", "//content/browser/speech/proto",
"//content/common:mojo_bindings",
"//crypto", "//crypto",
"//google_apis", "//google_apis",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/service_provider:service_provider",
"//mojo/public/js/bindings",
"//net", "//net",
"//net:http_server",
"//skia", "//skia",
"//sql", "//sql",
"//third_party/leveldatabase",
"//third_party/re2", "//third_party/re2",
"//third_party/WebKit/public:blink_headers", "//third_party/WebKit/public:blink_headers",
"//third_party/zlib", "//third_party/zlib",
...@@ -62,16 +38,72 @@ source_set("browser") { ...@@ -62,16 +38,72 @@ source_set("browser") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/resources", "//ui/resources",
"//ui/snapshot", "//ui/snapshot",
"//ui/surface",
"//webkit:resources",
"//webkit:strings",
"//webkit/browser:storage",
"//webkit/common",
"//webkit/common:storage",
# TODO(GYP)
#'../third_party/angle/src/build_angle.gyp:commit_id',
] ]
if (is_ios) {
# iOS doesn't get the normal file list and only takes these whitelisted
# files.
sources = [
"browser_context.cc",
"browser_main_loop.cc",
"browser_main_runner.cc",
"browser_process_sub_thread.cc",
"browser_thread_impl.cc",
"browser_url_handler_impl.cc",
"cert_store_impl.cc",
"download/download_create_info.cc",
"notification_service_impl.cc",
"signed_certificate_timestamp_store_impl.cc",
"user_metrics.cc",
"web_contents/navigation_entry_impl.cc",
]
} else {
# Normal non-iOS sources get everything.
sources = rebase_path(content_browser_gypi_values.private_browser_sources,
".", "//content")
# TODO(GYP) these generated files are listed as sources in content_browser.
# This is a bit suspicious. The GN grit template will make a source set
# containing the generated code so it should be sufficient to just depend
# on the grit rule. But maybe some of these will need to be added?
#
# Need this annoying rebase_path call to match what happened with the
# sources.
sources -= rebase_path([
"$root_gen_dir/webkit/grit/devtools_resources.h",
"$root_gen_dir/webkit/grit/devtools_resources_map.cc",
"$root_gen_dir/webkit/grit/devtools_resources_map.h",
"$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
"$root_gen_dir/ui/ui_resources/grit/webui_resources_map.cc",
"$root_gen_dir/content/browser/devtools/devtools_protocol_constants.cc",
"$root_gen_dir/content/browser/devtools/devtools_protocol_constants.h",
], ".")
# Non-iOS deps.
deps += [
"//content/browser/devtools:resources",
"//content/common:mojo_bindings",
"//cc",
"//cc:surfaces",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/service_provider:service_provider",
"//mojo/public/js/bindings",
"//net:http_server",
"//third_party/leveldatabase",
"//third_party/libyuv",
"//ui/surface",
"//webkit:resources",
"//webkit:strings",
"//webkit/browser:storage",
"//webkit/common",
"//webkit/common:storage",
# TODO(GYP)
#"//third_party/angle:commit_id",
]
}
configs += [ "//content:content_implementation" ]
if (toolkit_views) { if (toolkit_views) {
deps += [ "//ui/events" ] deps += [ "//ui/events" ]
} }
...@@ -87,16 +119,11 @@ source_set("browser") { ...@@ -87,16 +119,11 @@ source_set("browser") {
} }
if (!is_win && !is_mac && (!is_linux || !use_udev)) { if (!is_win && !is_mac && (!is_linux || !use_udev)) {
sources += [ "browser/gamepad/gamepad_platform_data_fetcher.cc" ] sources += [ "gamepad/gamepad_platform_data_fetcher.cc" ]
}
if (is_ios) {
# TODO(GYP) lots of inclusions and exclusions for iOS.
} }
if (enable_printing != 0) { if (enable_printing != 0) {
#TODO(GYP) deps += [ "//printing" ]
#deps += [ "//printing" ]
} }
# TODO(GYP) # TODO(GYP)
...@@ -105,88 +132,62 @@ source_set("browser") { ...@@ -105,88 +132,62 @@ source_set("browser") {
# '../third_party/WebKit/public/blink.gyp:blink', # '../third_party/WebKit/public/blink.gyp:blink',
# ], # ],
# }], # }],
# ['OS!="mac" and OS!="ios"', { if (!is_mac && !is_ios) {
# 'dependencies': [ deps += [ "//sandbox" ]
# '../sandbox/sandbox.gyp:sandbox', }
# ], if (!is_android && !is_ios) {
# }], # TODO(GYP)
# ['OS!="android" and OS!="ios"', { #deps += [ "//content/browser/tracing:resources" ]
# 'dependencies': [ }
# 'browser/tracing/tracing_resources.gyp:tracing_resources',
# ], if (enable_webrtc) {
# }], sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources,
# ['OS!="ios"', { ".", "//content")
# 'dependencies': [ # TODO(GYP)
# '../third_party/libyuv/libyuv.gyp:libyuv', #deps += [ "//jingle:glue" ]
# ], if (is_linux) {
# }], # TODO(GYP)
# ['enable_webrtc==1', { #deps += [ "//third_party/libjingle:libjingle_webrtc" ]
# 'dependencies': [ }
# '../jingle/jingle.gyp:jingle_glue', if (is_linux || is_mac || is_win) {
# ], sources += [
# 'sources': [ "media/capture/desktop_capture_device.cc",
# 'browser/renderer_host/media/peer_connection_tracker_host.cc', "media/capture/desktop_capture_device.h",
# 'browser/renderer_host/media/peer_connection_tracker_host.h', "media/capture/desktop_capture_device_aura.cc",
# 'browser/renderer_host/media/webrtc_identity_service_host.cc', "media/capture/desktop_capture_device_aura.h",
# 'browser/renderer_host/media/webrtc_identity_service_host.h', "media/capture/desktop_capture_device_uma_types.cc",
# 'browser/renderer_host/p2p/socket_host.cc', "media/capture/desktop_capture_device_uma_types.h",
# 'browser/renderer_host/p2p/socket_host.h', ]
# 'browser/renderer_host/p2p/socket_host_tcp.cc', defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
# 'browser/renderer_host/p2p/socket_host_tcp.h', # TODO(GYP)
# 'browser/renderer_host/p2p/socket_host_tcp_server.cc', #deps += [ "//third_party/webrtc/modules:desktop_capture" ]
# 'browser/renderer_host/p2p/socket_host_tcp_server.h', }
# 'browser/renderer_host/p2p/socket_host_throttler.cc', }
# 'browser/renderer_host/p2p/socket_host_throttler.h',
# 'browser/renderer_host/p2p/socket_host_udp.cc', if (is_win) {
# 'browser/renderer_host/p2p/socket_host_udp.h', sources -= [
# 'browser/renderer_host/p2p/socket_dispatcher_host.cc', "device_sensors/data_fetcher_shared_memory_default.cc",
# 'browser/renderer_host/p2p/socket_dispatcher_host.h', "geolocation/empty_wifi_data_provider.cc",
# ], ]
# }], defines += [
# ['enable_webrtc==1 and OS=="linux"', { # This prevents the inclusion of atlhost.h which paired
# 'dependencies': [ # with the windows 8 sdk it does the wrong thing.
# '../third_party/libjingle/libjingle.gyp:libjingle_webrtc', "__ATLHOST_H__",
# ], ]
# }], deps += [
# ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', { # TODO(GYP)
# 'sources': [ #"//third_party/iaccessible2",
# 'browser/media/capture/desktop_capture_device.cc', #"//third_party/isimpledom",
# 'browser/media/capture/desktop_capture_device.h', ]
# 'browser/media/capture/desktop_capture_device_aura.cc', libs += [
# 'browser/media/capture/desktop_capture_device_aura.h', "comctl32.lib",
# 'browser/media/capture/desktop_capture_device_uma_types.cc', "dinput8.lib",
# 'browser/media/capture/desktop_capture_device_uma_types.h', "dwmapi.lib",
# ], "dxguid.lib",
# 'dependencies': [ "sensorsapi.lib",
# '../third_party/webrtc/modules/modules.gyp:desktop_capture', "portabledeviceguids.lib",
# ], ]
# 'defines': [ # TODI(GYP)
# 'ENABLE_SCREEN_CAPTURE=1',
# ],
# }],
# ['OS=="win"', {
# 'dependencies': [
# # For accessibility
# '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
# '../third_party/isimpledom/isimpledom.gyp:isimpledom',
# ],
# 'sources/': [
# ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'],
# ],
# 'defines': [
# # This prevents the inclusion of atlhost.h which paired
# # with the windows 8 sdk it does the wrong thing.
# '__ATLHOST_H__',
# ],
# 'link_settings': {
# 'libraries': [
# '-lcomctl32.lib',
# '-ldinput8.lib',
# '-ldwmapi.lib',
# '-ldxguid.lib',
# '-lsensorsapi.lib',
# '-lportabledeviceguids.lib',
# ],
# 'msvs_settings': { # 'msvs_settings': {
# 'VCLinkerTool': { # 'VCLinkerTool': {
# 'DelayLoadDLLs': [ # 'DelayLoadDLLs': [
...@@ -194,187 +195,155 @@ source_set("browser") { ...@@ -194,187 +195,155 @@ source_set("browser") {
# 'user32.dll', # 'user32.dll',
# 'dwmapi.dll', # 'dwmapi.dll',
# ], # ],
# }, }
# },
# }, if (is_linux) {
# }], deps += [ "//sandbox/linux:libc_urandom_override" ]
# ['OS=="linux"', { }
# 'dependencies': [
# '../sandbox/sandbox.gyp:libc_urandom_override', if (use_udev) {
# ], configs += [ "//build/config/linux:udev" ]
# }], } else {
# ['use_udev == 1', { # Remove udev-specific sources.
# 'dependencies': [ sources -= [
# '../build/linux/system.gyp:udev', "device_monitor_udev.cc",
# ], "device_monitor_udev.h",
# }, { "gamepad/gamepad_platform_data_fetcher_linux.cc",
# 'sources!': [ "udev_linux.cc",
# 'browser/device_monitor_udev.cc', "udev_linux.h",
# 'browser/device_monitor_udev.h', ]
# 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', }
# 'browser/udev_linux.cc',
# 'browser/udev_linux.h', if (enable_plugins) {
# ], sources += rebase_path(content_browser_gypi_values.plugin_browser_sources,
# }], ".", "//content")
# ['OS=="linux" and use_aura==1', { deps += [
# 'dependencies': [ "//ppapi:ppapi_ipc",
# '../build/linux/system.gyp:fontconfig', "//ppapi:ppapi_shared",
# ], ]
# }], if (!use_ozone || use_pango) {
# ['use_x11==1', { sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ]
# 'dependencies': [ }
# '../build/linux/system.gyp:x11', }
# ],
# }], if (is_linux && use_aura) {
# ['use_pango==1', { configs += [ "//build/config/linux:fontconfig" ]
# 'dependencies': [ }
# '../build/linux/system.gyp:pangocairo',
# ], if (use_x11) {
# 'sources!': [ configs += [ "//build/config/linux:x11" ]
# 'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc', }
# ],
# }], if (use_pango) {
# ['OS=="android"', { configs += [ "//build/config/linux:pangocairo" ]
# 'dependencies': [ }
# '../media/media.gyp:media',
# 'content.gyp:content_jni_headers', if (is_android) {
# ], sources += rebase_path(content_browser_gypi_values.android_browser_sources,
# 'link_settings': { ".", "//content")
# 'libraries': [ sources -= [
# '-ljnigraphics', "battery_status/battery_status_manager_default.cc",
# ], "browser_ipc_logging.cc",
# }, "device_sensors/data_fetcher_shared_memory_default.cc",
# 'sources/': [ "font_list_async.cc",
# ['exclude', '^browser/battery_status/battery_status_manager_default.cc$'], "geolocation/device_data_provider.cc",
# ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], "geolocation/empty_device_data_provider.cc",
# ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], "geolocation/network_location_provider.cc",
# ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], "geolocation/network_location_provider.h",
# ['exclude', '^browser/tracing/tracing_ui'], "geolocation/network_location_request.cc",
# ['exclude', '^browser/speech/'], "geolocation/network_location_request.h",
# ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'], "geolocation/wifi_data_provider_common.cc",
# ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'], "renderer_host/native_web_keyboard_event.cc",
# ['include', '^browser/speech/speech_recognizer\\.h$'], "tracing/tracing_ui.cc",
# ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], "tracing/tracing_ui.h",
# ],
# 'sources!': [ # Android skips most, but not all, of the speech code.
# 'browser/browser_ipc_logging.cc', "speech/audio_buffer.cc",
# 'browser/font_list_async.cc', "speech/audio_buffer.h",
# 'browser/geolocation/device_data_provider.cc', "speech/audio_encoder.cc",
# 'browser/geolocation/empty_device_data_provider.cc', "speech/audio_encoder.h",
# 'browser/geolocation/wifi_data_provider_common.cc', "speech/chunked_byte_buffer.cc",
# 'browser/renderer_host/native_web_keyboard_event.cc', "speech/chunked_byte_buffer.h",
# ] "speech/endpointer/endpointer.cc",
# }, { # OS!="android" "speech/endpointer/endpointer.h",
# 'sources/': [ "speech/endpointer/energy_endpointer.cc",
# ['exclude', '^browser/renderer_host/java/'], "speech/endpointer/energy_endpointer.h",
# ['exclude', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)'], "speech/endpointer/energy_endpointer_params.cc",
# ], "speech/endpointer/energy_endpointer_params.h",
# }], "speech/google_one_shot_remote_engine.cc",
# ['OS=="mac"', { "speech/google_one_shot_remote_engine.h",
# 'sources/': [ "speech/google_streaming_remote_engine.cc",
# ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], "speech/google_streaming_remote_engine.h",
# ], "speech/speech_recognition_engine.cc",
# 'sources!': [ "speech/speech_recognition_engine.h",
# 'browser/geolocation/empty_wifi_data_provider.cc', "speech/speech_recognizer_impl.cc",
# ], "speech/speech_recognizer_impl.h",
# 'dependencies': [ ]
# '../third_party/mozilla/mozilla.gyp:mozilla', deps += [
# '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor', #"//content:jni_headers", TODO(GYP)
# ], #"//media", TODO(GYP)
# 'link_settings': { ]
# 'libraries': [ libs += [ "jnigraphics" ]
# '$(SDKROOT)/usr/lib/libbsm.dylib', }
# ],
# }, if (is_mac) {
# }], sources -= [
# ['chromeos==1', { "device_sensors/data_fetcher_shared_memory_default.cc",
# 'dependencies': [ "geolocation/empty_wifi_data_provider.cc",
# '../build/linux/system.gyp:dbus', "geolocation/empty_wifi_data_provider.h",
# '../chromeos/chromeos.gyp:power_manager_proto', ]
# ], libs += [ "bsm" ]
# 'sources!': [ }
# 'browser/geolocation/wifi_data_provider_linux.cc',
# 'browser/power_save_blocker_ozone.cc', if (is_chromeos) {
# 'browser/power_save_blocker_x11.cc', sources -= [
# ], "geolocation/wifi_data_provider_linux.cc",
# }], "power_save_blocker_ozone.cc",
# ['os_bsd==1', { "power_save_blocker_x11.cc",
# 'sources/': [ ]
# ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], deps += [ "//chromeos:power_manager_proto" ]
# ], }
# }],
# ['use_aura==1', { if (use_aura) {
# 'dependencies': [ deps += [
# '../ui/aura/aura.gyp:aura', "//ui/aura",
# '../ui/strings/ui_strings.gyp:ui_strings', "//ui/strings",
# ], ]
# }, { } else { # Not aura.
# 'sources/': [ sources -= [
# ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'], "renderer_host/render_widget_host_view_aura.cc",
# ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'], "renderer_host/render_widget_host_view_aura.h",
# ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'], "web_contents/touch_editable_impl_aura.cc",
# ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'], "web_contents/touch_editable_impl_aura.h",
# ['exclude', '^browser/renderer_host/ui_events_helper.cc'], "renderer_host/ui_events_helper.cc",
# ['exclude', '^browser/renderer_host/ui_events_helper.h'], "renderer_host/ui_events_helper.h",
# ['exclude', '^browser/context_factory.cc'], "context_factory.cc",
# ['exclude', '^public/browser/context_factory.h'], ]
# ], }
# }],
# ['use_aura==1 or OS=="mac"', { if (use_aura || is_mac) {
# 'dependencies': [ sources += rebase_path(
# '../ui/compositor/compositor.gyp:compositor', content_browser_gypi_values.compositor_browser_sources,
# ], ".", "//content")
# }, { deps += [ "//ui/compositor" ]
# 'sources/': [ }
# ['exclude', '^browser/compositor/'],
# ] if (enable_speech_input) {
# }], deps += [
# ['enable_plugins==1', { #"//third_party/flac", TODO(GYP)
# 'dependencies': [ #"//third_party/speex", TODO(GYP)
# '../ppapi/ppapi_internal.gyp:ppapi_ipc', ]
# '../ppapi/ppapi_internal.gyp:ppapi_shared', }
# ],
# }, { # enable_plugins==0 if (is_linux && use_dbus) {
# 'sources!': [ sources -= [
# 'browser/pepper_flash_settings_helper_impl.cc', "geolocation/empty_wifi_data_provider.cc",
# 'browser/pepper_flash_settings_helper_impl.h', ]
# 'browser/plugin_data_remover_impl.cc', deps += [ "//dbus" ]
# 'browser/plugin_data_remover_impl.h', } else {
# 'browser/plugin_loader_posix.cc', if (!use_dbus) {
# 'browser/plugin_loader_posix.h', # This will already have gotten removed for all non-Linux cases.
# 'browser/plugin_process_host.cc', sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
# 'browser/plugin_process_host.h', }
# 'browser/plugin_service_impl.cc', }
# 'browser/plugin_service_impl.h',
# 'browser/ppapi_plugin_process_host.cc',
# 'public/browser/plugin_service.h',
# ],
# 'sources/': [
# ['exclude', '^browser/renderer_host/pepper/'],
# ],
# }],
# ['input_speech==1', {
# 'dependencies': [
# '../third_party/flac/flac.gyp:libflac',
# '../third_party/speex/speex.gyp:libspeex',
# ],
# }],
# ['OS == "win"', {
# 'sources!': [
# 'browser/geolocation/empty_wifi_data_provider.cc',
# ],
# }],
# ['OS == "linux" and use_dbus==1', {
# 'sources!': [
# 'browser/geolocation/empty_wifi_data_provider.cc',
# ],
# 'dependencies': [
# '../build/linux/system.gyp:dbus',
# '../dbus/dbus.gyp:dbus',
# ],
# }, { # OS != "linux" or use_dbus==0
# 'sources!': [
# 'browser/geolocation/wifi_data_provider_linux.cc',
# ],
# }],
} }
content/content_browser.gypi
View file @ 743530fb
...@@ -360,45 +360,6 @@ ...@@ -360,45 +360,6 @@
'browser/child_process_launcher.h', 'browser/child_process_launcher.h',
'browser/child_process_security_policy_impl.cc', 'browser/child_process_security_policy_impl.cc',
'browser/child_process_security_policy_impl.h', 'browser/child_process_security_policy_impl.h',
'browser/compositor/browser_compositor_output_surface.cc',
'browser/compositor/browser_compositor_output_surface.h',
'browser/compositor/browser_compositor_output_surface_proxy.cc',
'browser/compositor/browser_compositor_output_surface_proxy.h',
'browser/compositor/browser_compositor_view_mac.mm',
'browser/compositor/browser_compositor_view_mac.h',
'browser/compositor/delegated_frame_host.cc',
'browser/compositor/delegated_frame_host.h',
'browser/compositor/gpu_process_transport_factory.cc',
'browser/compositor/gpu_process_transport_factory.h',
'browser/compositor/image_transport_factory.cc',
'browser/compositor/image_transport_factory.h',
'browser/compositor/no_transport_image_transport_factory.cc',
'browser/compositor/no_transport_image_transport_factory.h',
'browser/compositor/onscreen_display_client.cc',
'browser/compositor/onscreen_display_client.h',
'browser/compositor/overlay_candidate_validator_ozone.cc',
'browser/compositor/overlay_candidate_validator_ozone.h',
'browser/compositor/owned_mailbox.h',
'browser/compositor/owned_mailbox.cc',
'browser/compositor/reflector_impl.cc',
'browser/compositor/reflector_impl.h',
'browser/compositor/resize_lock.cc',
'browser/compositor/resize_lock.h',
'browser/compositor/gpu_browser_compositor_output_surface.cc',
'browser/compositor/gpu_browser_compositor_output_surface.h',
'browser/compositor/software_browser_compositor_output_surface.cc',
'browser/compositor/software_browser_compositor_output_surface.h',
'browser/compositor/software_output_device_mac.mm',
'browser/compositor/software_output_device_mac.h',
'browser/compositor/software_output_device_ozone.cc',
'browser/compositor/software_output_device_ozone.h',
'browser/compositor/software_output_device_win.cc',
'browser/compositor/software_output_device_win.h',
'browser/compositor/software_output_device_x11.cc',
'browser/compositor/software_output_device_x11.h',
'browser/compositor/surface_display_output_surface.cc',
'browser/compositor/surface_display_output_surface.h',
'browser/context_factory.cc',
'browser/cross_site_request_manager.cc', 'browser/cross_site_request_manager.cc',
'browser/cross_site_request_manager.h', 'browser/cross_site_request_manager.h',
'browser/devtools/devtools_agent_host_impl.cc', 'browser/devtools/devtools_agent_host_impl.cc',
...@@ -835,17 +796,6 @@ ...@@ -835,17 +796,6 @@
'browser/net/view_http_cache_job_factory.h', 'browser/net/view_http_cache_job_factory.h',
'browser/notification_service_impl.cc', 'browser/notification_service_impl.cc',
'browser/notification_service_impl.h', 'browser/notification_service_impl.h',
'browser/pepper_flash_settings_helper_impl.cc',
'browser/pepper_flash_settings_helper_impl.h',
'browser/plugin_data_remover_impl.cc',
'browser/plugin_data_remover_impl.h',
'browser/plugin_loader_posix.cc',
'browser/plugin_loader_posix.h',
'browser/plugin_process_host.cc',
'browser/plugin_process_host.h',
'browser/plugin_process_host_mac.cc',
'browser/plugin_service_impl.cc',
'browser/plugin_service_impl.h',
'browser/power_monitor_message_broadcaster.cc', 'browser/power_monitor_message_broadcaster.cc',
'browser/power_monitor_message_broadcaster.h', 'browser/power_monitor_message_broadcaster.h',
'browser/power_profiler/power_data_provider.h', 'browser/power_profiler/power_data_provider.h',
...@@ -863,8 +813,6 @@ ...@@ -863,8 +813,6 @@
'browser/power_save_blocker_ozone.cc', 'browser/power_save_blocker_ozone.cc',
'browser/power_save_blocker_win.cc', 'browser/power_save_blocker_win.cc',
'browser/power_save_blocker_x11.cc', 'browser/power_save_blocker_x11.cc',
'browser/ppapi_plugin_process_host.cc',
'browser/ppapi_plugin_process_host.h',
'browser/profiler_controller_impl.cc', 'browser/profiler_controller_impl.cc',
'browser/profiler_controller_impl.h', 'browser/profiler_controller_impl.h',
'browser/profiler_message_filter.cc', 'browser/profiler_message_filter.cc',
...@@ -964,25 +912,6 @@ ...@@ -964,25 +912,6 @@
'browser/renderer_host/input/web_input_event_util.h', 'browser/renderer_host/input/web_input_event_util.h',
'browser/renderer_host/input/web_input_event_util_posix.cc', 'browser/renderer_host/input/web_input_event_util_posix.cc',
'browser/renderer_host/input/web_input_event_util_posix.h', 'browser/renderer_host/input/web_input_event_util_posix.h',
'browser/renderer_host/java/gin_java_bound_object.h',
'browser/renderer_host/java/gin_java_method_invocation_helper.cc',
'browser/renderer_host/java/gin_java_method_invocation_helper.h',
'browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc',
'browser/renderer_host/java/gin_java_script_to_java_types_coercion.h',
'browser/renderer_host/java/java_bound_object.cc',
'browser/renderer_host/java/java_bound_object.h',
'browser/renderer_host/java/java_bridge_channel_host.cc',
'browser/renderer_host/java/java_bridge_channel_host.h',
'browser/renderer_host/java/java_bridge_dispatcher_host.cc',
'browser/renderer_host/java/java_bridge_dispatcher_host.h',
'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc',
'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h',
'browser/renderer_host/java/java_method.cc',
'browser/renderer_host/java/java_method.h',
'browser/renderer_host/java/java_type.cc',
'browser/renderer_host/java/java_type.h',
'browser/renderer_host/java/jni_helper.cc',
'browser/renderer_host/java/jni_helper.h',
'browser/renderer_host/legacy_render_widget_host_win.cc', 'browser/renderer_host/legacy_render_widget_host_win.cc',
'browser/renderer_host/legacy_render_widget_host_win.h', 'browser/renderer_host/legacy_render_widget_host_win.h',
'browser/renderer_host/media/audio_input_device_manager.cc', 'browser/renderer_host/media/audio_input_device_manager.cc',
...@@ -1033,63 +962,6 @@ ...@@ -1033,63 +962,6 @@
'browser/renderer_host/overscroll_controller.cc', 'browser/renderer_host/overscroll_controller.cc',
'browser/renderer_host/overscroll_controller.h', 'browser/renderer_host/overscroll_controller.h',
'browser/renderer_host/overscroll_controller_delegate.h', 'browser/renderer_host/overscroll_controller_delegate.h',
'browser/renderer_host/pepper/browser_ppapi_host_impl.cc',
'browser/renderer_host/pepper/browser_ppapi_host_impl.h',
'browser/renderer_host/pepper/content_browser_pepper_host_factory.cc',
'browser/renderer_host/pepper/content_browser_pepper_host_factory.h',
'browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc',
'browser/renderer_host/pepper/pepper_browser_font_singleton_host.h',
'browser/renderer_host/pepper/pepper_external_file_ref_backend.cc',
'browser/renderer_host/pepper/pepper_external_file_ref_backend.h',
'browser/renderer_host/pepper/pepper_file_io_host.cc',
'browser/renderer_host/pepper/pepper_file_io_host.h',
'browser/renderer_host/pepper/pepper_file_ref_host.cc',
'browser/renderer_host/pepper/pepper_file_ref_host.h',
'browser/renderer_host/pepper/pepper_file_system_browser_host.cc',
'browser/renderer_host/pepper/pepper_file_system_browser_host.h',
'browser/renderer_host/pepper/pepper_flash_file_message_filter.cc',
'browser/renderer_host/pepper/pepper_flash_file_message_filter.h',
'browser/renderer_host/pepper/pepper_gamepad_host.cc',
'browser/renderer_host/pepper/pepper_gamepad_host.h',
'browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc',
'browser/renderer_host/pepper/pepper_host_resolver_message_filter.h',
'browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc',
'browser/renderer_host/pepper/pepper_internal_file_ref_backend.h',
'browser/renderer_host/pepper/pepper_lookup_request.h',
'browser/renderer_host/pepper/pepper_message_filter.cc',
'browser/renderer_host/pepper/pepper_message_filter.h',
'browser/renderer_host/pepper/pepper_network_monitor_host.cc',
'browser/renderer_host/pepper/pepper_network_monitor_host.h',
'browser/renderer_host/pepper/pepper_network_proxy_host.cc',
'browser/renderer_host/pepper/pepper_network_proxy_host.h',
'browser/renderer_host/pepper/pepper_print_settings_manager.cc',
'browser/renderer_host/pepper/pepper_print_settings_manager.h',
'browser/renderer_host/pepper/pepper_printing_host.cc',
'browser/renderer_host/pepper/pepper_printing_host.h',
'browser/renderer_host/pepper/pepper_renderer_connection.cc',
'browser/renderer_host/pepper/pepper_renderer_connection.h',
'browser/renderer_host/pepper/pepper_security_helper.cc',
'browser/renderer_host/pepper/pepper_security_helper.h',
'browser/renderer_host/pepper/pepper_socket_utils.cc',
'browser/renderer_host/pepper/pepper_socket_utils.h',
'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h',
'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h',
'browser/renderer_host/pepper/pepper_truetype_font_list.h',
'browser/renderer_host/pepper/pepper_truetype_font_list_android.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_host.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_host.h',
'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_pango.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm',
'browser/renderer_host/pepper/pepper_truetype_font_list_win.cc',
'browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_udp_socket_message_filter.h',
'browser/renderer_host/pepper/quota_reservation.cc',
'browser/renderer_host/pepper/quota_reservation.h',
'browser/renderer_host/pepper/ssl_context_helper.cc',
'browser/renderer_host/pepper/ssl_context_helper.h',
'browser/renderer_host/popup_menu_helper_mac.h', 'browser/renderer_host/popup_menu_helper_mac.h',
'browser/renderer_host/popup_menu_helper_mac.mm', 'browser/renderer_host/popup_menu_helper_mac.mm',
'browser/renderer_host/render_message_filter.cc', 'browser/renderer_host/render_message_filter.cc',
...@@ -1403,6 +1275,166 @@ ...@@ -1403,6 +1275,166 @@
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc', '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc',
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h', '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h',
], ],
'android_browser_sources': [
'browser/renderer_host/java/gin_java_bound_object.h',
'browser/renderer_host/java/gin_java_method_invocation_helper.cc',
'browser/renderer_host/java/gin_java_method_invocation_helper.h',
'browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc',
'browser/renderer_host/java/gin_java_script_to_java_types_coercion.h',
'browser/renderer_host/java/java_bound_object.cc',
'browser/renderer_host/java/java_bound_object.h',
'browser/renderer_host/java/java_bridge_channel_host.cc',
'browser/renderer_host/java/java_bridge_channel_host.h',
'browser/renderer_host/java/java_bridge_dispatcher_host.cc',
'browser/renderer_host/java/java_bridge_dispatcher_host.h',
'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc',
'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h',
'browser/renderer_host/java/java_method.cc',
'browser/renderer_host/java/java_method.h',
'browser/renderer_host/java/java_type.cc',
'browser/renderer_host/java/java_type.h',
'browser/renderer_host/java/jni_helper.cc',
'browser/renderer_host/java/jni_helper.h',
],
'webrtc_browser_sources': [
'browser/media/webrtc_internals.cc',
'browser/media/webrtc_internals.h',
'browser/media/webrtc_internals_message_handler.cc',
'browser/media/webrtc_internals_message_handler.h',
'browser/media/webrtc_internals_ui.cc',
'browser/media/webrtc_internals_ui.h',
'browser/media/webrtc_internals_ui_observer.h',
'browser/renderer_host/media/peer_connection_tracker_host.cc',
'browser/renderer_host/media/peer_connection_tracker_host.h',
'browser/renderer_host/media/webrtc_identity_service_host.cc',
'browser/renderer_host/media/webrtc_identity_service_host.h',
'browser/renderer_host/p2p/socket_host.cc',
'browser/renderer_host/p2p/socket_host.h',
'browser/renderer_host/p2p/socket_host_tcp.cc',
'browser/renderer_host/p2p/socket_host_tcp.h',
'browser/renderer_host/p2p/socket_host_tcp_server.cc',
'browser/renderer_host/p2p/socket_host_tcp_server.h',
'browser/renderer_host/p2p/socket_host_throttler.cc',
'browser/renderer_host/p2p/socket_host_throttler.h',
'browser/renderer_host/p2p/socket_host_udp.cc',
'browser/renderer_host/p2p/socket_host_udp.h',
'browser/renderer_host/p2p/socket_dispatcher_host.cc',
'browser/renderer_host/p2p/socket_dispatcher_host.h',
],
'compositor_browser_sources': [
'browser/compositor/browser_compositor_output_surface.cc',
'browser/compositor/browser_compositor_output_surface.h',
'browser/compositor/browser_compositor_output_surface_proxy.cc',
'browser/compositor/browser_compositor_output_surface_proxy.h',
'browser/compositor/browser_compositor_view_mac.mm',
'browser/compositor/browser_compositor_view_mac.h',
'browser/compositor/delegated_frame_host.cc',
'browser/compositor/delegated_frame_host.h',
'browser/compositor/gpu_process_transport_factory.cc',
'browser/compositor/gpu_process_transport_factory.h',
'browser/compositor/image_transport_factory.cc',
'browser/compositor/image_transport_factory.h',
'browser/compositor/no_transport_image_transport_factory.cc',
'browser/compositor/no_transport_image_transport_factory.h',
'browser/compositor/onscreen_display_client.cc',
'browser/compositor/onscreen_display_client.h',
'browser/compositor/overlay_candidate_validator_ozone.cc',
'browser/compositor/overlay_candidate_validator_ozone.h',
'browser/compositor/owned_mailbox.h',
'browser/compositor/owned_mailbox.cc',
'browser/compositor/reflector_impl.cc',
'browser/compositor/reflector_impl.h',
'browser/compositor/resize_lock.cc',
'browser/compositor/resize_lock.h',
'browser/compositor/gpu_browser_compositor_output_surface.cc',
'browser/compositor/gpu_browser_compositor_output_surface.h',
'browser/compositor/software_browser_compositor_output_surface.cc',
'browser/compositor/software_browser_compositor_output_surface.h',
'browser/compositor/software_output_device_mac.mm',
'browser/compositor/software_output_device_mac.h',
'browser/compositor/software_output_device_ozone.cc',
'browser/compositor/software_output_device_ozone.h',
'browser/compositor/software_output_device_win.cc',
'browser/compositor/software_output_device_win.h',
'browser/compositor/software_output_device_x11.cc',
'browser/compositor/software_output_device_x11.h',
'browser/compositor/surface_display_output_surface.cc',
'browser/compositor/surface_display_output_surface.h',
'browser/context_factory.cc',
],
'plugin_browser_sources': [
'browser/pepper_flash_settings_helper_impl.cc',
'browser/pepper_flash_settings_helper_impl.h',
'browser/plugin_data_remover_impl.cc',
'browser/plugin_data_remover_impl.h',
'browser/plugin_loader_posix.cc',
'browser/plugin_loader_posix.h',
'browser/plugin_process_host.cc',
'browser/plugin_process_host.h',
'browser/plugin_process_host_mac.cc',
'browser/plugin_service_impl.cc',
'browser/plugin_service_impl.h',
'browser/ppapi_plugin_process_host.cc',
'browser/ppapi_plugin_process_host.h',
'browser/renderer_host/pepper/browser_ppapi_host_impl.cc',
'browser/renderer_host/pepper/browser_ppapi_host_impl.h',
'browser/renderer_host/pepper/content_browser_pepper_host_factory.cc',
'browser/renderer_host/pepper/content_browser_pepper_host_factory.h',
'browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc',
'browser/renderer_host/pepper/pepper_browser_font_singleton_host.h',
'browser/renderer_host/pepper/pepper_external_file_ref_backend.cc',
'browser/renderer_host/pepper/pepper_external_file_ref_backend.h',
'browser/renderer_host/pepper/pepper_file_io_host.cc',
'browser/renderer_host/pepper/pepper_file_io_host.h',
'browser/renderer_host/pepper/pepper_file_ref_host.cc',
'browser/renderer_host/pepper/pepper_file_ref_host.h',
'browser/renderer_host/pepper/pepper_file_system_browser_host.cc',
'browser/renderer_host/pepper/pepper_file_system_browser_host.h',
'browser/renderer_host/pepper/pepper_flash_file_message_filter.cc',
'browser/renderer_host/pepper/pepper_flash_file_message_filter.h',
'browser/renderer_host/pepper/pepper_gamepad_host.cc',
'browser/renderer_host/pepper/pepper_gamepad_host.h',
'browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc',
'browser/renderer_host/pepper/pepper_host_resolver_message_filter.h',
'browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc',
'browser/renderer_host/pepper/pepper_internal_file_ref_backend.h',
'browser/renderer_host/pepper/pepper_lookup_request.h',
'browser/renderer_host/pepper/pepper_message_filter.cc',
'browser/renderer_host/pepper/pepper_message_filter.h',
'browser/renderer_host/pepper/pepper_network_monitor_host.cc',
'browser/renderer_host/pepper/pepper_network_monitor_host.h',
'browser/renderer_host/pepper/pepper_network_proxy_host.cc',
'browser/renderer_host/pepper/pepper_network_proxy_host.h',
'browser/renderer_host/pepper/pepper_printing_host.cc',
'browser/renderer_host/pepper/pepper_printing_host.h',
'browser/renderer_host/pepper/pepper_print_settings_manager.cc',
'browser/renderer_host/pepper/pepper_print_settings_manager.h',
'browser/renderer_host/pepper/pepper_renderer_connection.cc',
'browser/renderer_host/pepper/pepper_renderer_connection.h',
'browser/renderer_host/pepper/pepper_security_helper.cc',
'browser/renderer_host/pepper/pepper_security_helper.h',
'browser/renderer_host/pepper/pepper_socket_utils.cc',
'browser/renderer_host/pepper/pepper_socket_utils.h',
'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h',
'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h',
'browser/renderer_host/pepper/pepper_truetype_font_list_android.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list.h',
'browser/renderer_host/pepper/pepper_truetype_font_list_host.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_host.h',
'browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm',
'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_pango.cc',
'browser/renderer_host/pepper/pepper_truetype_font_list_win.cc',
'browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc',
'browser/renderer_host/pepper/pepper_udp_socket_message_filter.h',
'browser/renderer_host/pepper/quota_reservation.cc',
'browser/renderer_host/pepper/quota_reservation.h',
'browser/renderer_host/pepper/ssl_context_helper.cc',
'browser/renderer_host/pepper/ssl_context_helper.h',
'public/browser/plugin_service.h',
],
}, },
'sources': [ 'sources': [
'<@(public_browser_sources)', '<@(public_browser_sources)',
...@@ -1508,29 +1540,7 @@ ...@@ -1508,29 +1540,7 @@
'../jingle/jingle.gyp:jingle_glue', '../jingle/jingle.gyp:jingle_glue',
], ],
'sources': [ 'sources': [
'browser/media/webrtc_internals.cc', '<@(webrtc_browser_sources)',
'browser/media/webrtc_internals.h',
'browser/media/webrtc_internals_message_handler.cc',
'browser/media/webrtc_internals_message_handler.h',
'browser/media/webrtc_internals_ui.cc',
'browser/media/webrtc_internals_ui.h',
'browser/media/webrtc_internals_ui_observer.h',
'browser/renderer_host/media/peer_connection_tracker_host.cc',
'browser/renderer_host/media/peer_connection_tracker_host.h',
'browser/renderer_host/media/webrtc_identity_service_host.cc',
'browser/renderer_host/media/webrtc_identity_service_host.h',
'browser/renderer_host/p2p/socket_host.cc',
'browser/renderer_host/p2p/socket_host.h',
'browser/renderer_host/p2p/socket_host_tcp.cc',
'browser/renderer_host/p2p/socket_host_tcp.h',
'browser/renderer_host/p2p/socket_host_tcp_server.cc',
'browser/renderer_host/p2p/socket_host_tcp_server.h',
'browser/renderer_host/p2p/socket_host_throttler.cc',
'browser/renderer_host/p2p/socket_host_throttler.h',
'browser/renderer_host/p2p/socket_host_udp.cc',
'browser/renderer_host/p2p/socket_host_udp.h',
'browser/renderer_host/p2p/socket_dispatcher_host.cc',
'browser/renderer_host/p2p/socket_dispatcher_host.h',
], ],
}], }],
['enable_webrtc==1 and OS=="linux"', { ['enable_webrtc==1 and OS=="linux"', {
...@@ -1635,17 +1645,20 @@ ...@@ -1635,17 +1645,20 @@
], ],
}, },
'sources/': [ 'sources/': [
['exclude', '^browser/battery_status/battery_status_manager_default.cc$'], ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc$'],
['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'],
['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
['exclude', '^browser/tracing/tracing_ui'], ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
['exclude', '^browser/speech/'], ['exclude', '^browser/speech/'],
['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'], ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'],
['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'], ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'],
['include', '^browser/speech/speech_recognizer\\.h$'], ['include', '^browser/speech/speech_recognizer\\.h$'],
['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
], ],
'sources': [
'<@(android_browser_sources)',
],
'sources!': [ 'sources!': [
'browser/browser_ipc_logging.cc', 'browser/browser_ipc_logging.cc',
'browser/font_list_async.cc', 'browser/font_list_async.cc',
...@@ -1654,11 +1667,6 @@ ...@@ -1654,11 +1667,6 @@
'browser/geolocation/wifi_data_provider_common.cc', 'browser/geolocation/wifi_data_provider_common.cc',
'browser/renderer_host/native_web_keyboard_event.cc', 'browser/renderer_host/native_web_keyboard_event.cc',
] ]
}, { # OS!="android"
'sources/': [
['exclude', '^browser/renderer_host/java/'],
['exclude', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)'],
],
}], }],
['OS=="mac"', { ['OS=="mac"', {
'sources/': [ 'sources/': [
...@@ -1712,10 +1720,9 @@ ...@@ -1712,10 +1720,9 @@
'dependencies': [ 'dependencies': [
'../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor',
], ],
'sources': [ '<@(compositor_browser_sources)' ],
}, { }, {
'sources/': [ 'sources/': [
['exclude', '^browser/compositor/'],
['exclude', '^browser/context_factory.cc'],
['exclude', '^public/browser/context_factory.h'], ['exclude', '^public/browser/context_factory.h'],
] ]
}], }],
...@@ -1724,23 +1731,8 @@ ...@@ -1724,23 +1731,8 @@
'../ppapi/ppapi_internal.gyp:ppapi_ipc', '../ppapi/ppapi_internal.gyp:ppapi_ipc',
'../ppapi/ppapi_internal.gyp:ppapi_shared', '../ppapi/ppapi_internal.gyp:ppapi_shared',
], ],
}, { # enable_plugins==0 'sources': [
'sources!': [ '<@(plugin_browser_sources)',
'browser/pepper_flash_settings_helper_impl.cc',
'browser/pepper_flash_settings_helper_impl.h',
'browser/plugin_data_remover_impl.cc',
'browser/plugin_data_remover_impl.h',
'browser/plugin_loader_posix.cc',
'browser/plugin_loader_posix.h',
'browser/plugin_process_host.cc',
'browser/plugin_process_host.h',
'browser/plugin_service_impl.cc',
'browser/plugin_service_impl.h',
'browser/ppapi_plugin_process_host.cc',
'public/browser/plugin_service.h',
],
'sources/': [
['exclude', '^browser/renderer_host/pepper/'],
], ],
}], }],
['input_speech==1', { ['input_speech==1', {
......
dbus/BUILD.gn
View file @ 743530fb
...@@ -41,7 +41,7 @@ component("dbus") { ...@@ -41,7 +41,7 @@ component("dbus") {
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
] ]
configs += [ direct_dependent_configs = [
"//build/config/linux:dbus", "//build/config/linux:dbus",
] ]
} }
......
third_party/protobuf/proto_library.gni
View file @ 743530fb
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# Compile a protocol buffer. # Compile a protocol buffer.
# #
# The 'proto_in_dir' variable must be the relative path to the # The 'proto_in_dir' variable is the path to the directory containing the
# directory containing the .proto files. If left out, it defaults to '.'. # .proto files. If left out, it defaults to '.'.
# #
# The 'proto_out_dir' variable specifies the path suffix that output files are # The 'proto_out_dir' variable specifies the path suffix that output files are
# generated under. Targets that gyp-depend on my_proto_lib will be able to # generated under. Targets that gyp-depend on my_proto_lib will be able to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment