Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/BUILD.gn

Issue 1824653002: Remove iOS conditions in content/ build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/BUILD.gn ('k') | content/child/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 3acc6fda1716a5b3daf01775d7f7e6486100b43c..3547ea6cde14b7d480f44ce5ec86f549bd8decb0 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -15,33 +15,51 @@ source_set("browser") {
configs += [
"//build/config:precompiled_headers",
+ "//content:content_implementation",
"//content/public/common:mojo_shell_client",
+ "//third_party/WebKit/public:debug_devtools",
+ "//v8:external_startup_data",
]
defines = []
libs = []
ldflags = []
- # Shared deps. See also non-iOS deps below.
deps = [
"//base",
"//base:base_static",
+ "//cc",
+ "//cc/surfaces",
+ "//components/filesystem:lib",
+ "//components/leveldb:lib",
"//components/mime_util",
+ "//components/profile_service:lib",
+ "//components/scheduler:common",
"//components/url_formatter",
"//content:resources",
+ "//content/app/resources",
+ "//content/app/strings",
"//content/browser/background_sync:background_sync_proto",
"//content/browser/cache_storage:cache_storage_proto",
+ "//content/browser/devtools:gen_devtools_protocol_handler",
+ "//content/browser/devtools:resources",
"//content/browser/notifications:notification_proto",
"//content/browser/service_worker:service_worker_proto",
"//content/browser/speech/proto",
+ "//content/common:mojo_bindings",
"//content/gpu:gpu_sources",
"//content/public/common:common_sources",
"//content/public/common:mojo_bindings",
"//crypto",
"//device/battery",
+ "//device/bluetooth",
"//device/vibration",
+ "//gin",
"//google_apis",
"//mojo/common",
+ "//mojo/common:url_type_converters",
+ "//mojo/converters/geometry",
"//mojo/public/cpp/bindings",
+ "//mojo/public/js",
"//mojo/shell",
"//mojo/shell/public/cpp:cpp_for_chromium",
"//mojo/shell/public/interfaces",
@@ -50,9 +68,23 @@ source_set("browser") {
"//net",
"//net:extras",
"//skia",
+ "//skia/public",
"//sql",
+ "//storage/browser",
+ "//storage/common",
+
+ # TODO(brettw) bug 582206: Blink should not be used in the browser
+ # process. This is required by devtools' input_handler.cc which calls
+ # WebKeyboardEvent::setKeyIdentifierFromWindowsKeyCode
+ "//third_party/WebKit/public:blink",
"//third_party/WebKit/public:blink_headers",
+ "//third_party/WebKit/public:image_resources",
+ "//third_party/WebKit/public:resources",
+ "//third_party/angle:commit_id",
+ "//third_party/icu",
"//third_party/kasko:kasko_features",
+ "//third_party/leveldatabase",
+ "//third_party/libyuv",
"//third_party/npapi",
"//third_party/re2",
"//third_party/zlib",
@@ -63,12 +95,15 @@ source_set("browser") {
"//ui/base/ime",
"//ui/events",
"//ui/events:gesture_detection",
+ "//ui/events/blink",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/native_theme",
"//ui/resources",
"//ui/snapshot",
+ "//ui/surface",
+ "//ui/touch_selection",
]
data_deps = [
@@ -76,94 +111,26 @@ source_set("browser") {
":chrome_renderer_manifest",
]
- 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/blink/grit/devtools_resources.h",
- "$root_gen_dir/blink/grit/devtools_resources_map.cc",
- "$root_gen_dir/blink/grit/devtools_resources_map.h",
- "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
- "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
- ],
- ".")
-
- # Non-iOS deps.
- deps += [
- "//cc",
- "//cc/surfaces",
- "//components/filesystem:lib",
- "//components/leveldb:lib",
- "//components/profile_service:lib",
- "//components/scheduler:common",
- "//content/app/resources",
- "//content/app/strings",
- "//content/browser/devtools:gen_devtools_protocol_handler",
- "//content/browser/devtools:resources",
- "//content/common:mojo_bindings",
- "//content/public/common:mojo_bindings",
- "//device/bluetooth",
- "//gin",
- "//mojo/common:url_type_converters",
- "//mojo/converters/geometry",
- "//mojo/public/cpp/bindings",
- "//mojo/public/js",
- "//mojo/shell/public/interfaces",
- "//skia/public",
- "//storage/browser",
- "//storage/common",
-
- # TODO(brettw) bug 582206: Blink should not be used in the browser
- # process. This is required by devtools' input_handler.cc which calls
- # WebKeyboardEvent::setKeyIdentifierFromWindowsKeyCode
- "//third_party/WebKit/public:blink",
- "//third_party/WebKit/public:image_resources",
- "//third_party/WebKit/public:resources",
- "//third_party/angle:commit_id",
- "//third_party/icu",
- "//third_party/leveldatabase",
- "//third_party/libyuv",
- "//ui/events/blink",
- "//ui/resources",
- "//ui/surface",
- "//ui/touch_selection",
- ]
-
- configs += [ "//v8:external_startup_data" ]
- }
-
- configs += [
- "//content:content_implementation",
- "//third_party/WebKit/public:debug_devtools",
- ]
+ 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/blink/grit/devtools_resources.h",
+ "$root_gen_dir/blink/grit/devtools_resources_map.cc",
+ "$root_gen_dir/blink/grit/devtools_resources_map.h",
+ "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
+ "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
+ ],
+ ".")
if (toolkit_views) {
deps += [ "//ui/events" ]
@@ -191,10 +158,10 @@ source_set("browser") {
# '../third_party/WebKit/public/blink.gyp:blink',
# ],
# }],
- if (!is_mac && !is_ios) {
+ if (!is_mac) {
deps += [ "//sandbox" ]
}
- if (!is_android && !is_ios) {
+ if (!is_android) {
deps += [ "//content/browser/tracing:resources" ]
}
if ((use_udev && is_posix) || is_mac || is_win) {
« no previous file with comments | « content/app/BUILD.gn ('k') | content/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698