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

Unified Diff: content/common/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/child/BUILD.gn ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index d334367cd5ebc87f986773c01f5e5fee61d2d7b9..b2f13d1a3a51e3ad7b68d163cb0d74b85d233a9b 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -141,6 +141,7 @@ source_set("common") {
]
public_deps = [
+ ":mojo_bindings",
"//gpu/command_buffer/common",
"//ipc",
"//third_party/WebKit/public:blink_headers",
@@ -148,17 +149,41 @@ source_set("common") {
deps = [
"//base",
"//build/util:webkit_version",
+ "//cc",
"//components/mus/public/interfaces",
"//components/tracing",
"//components/tracing:startup_tracing",
+ "//device/bluetooth",
+
+ # TODO: the dependency on gl_in_process_context should be decoupled from
+ # content and moved to android_webview. See crbug.com/365797.
+ "//gpu/blink",
+ "//gpu/command_buffer/client:gl_in_process_context",
+ "//gpu/command_buffer/client:gles2_c_lib",
+ "//gpu/command_buffer/client:gles2_cmd_helper",
+ "//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/common:gles2_utils",
+ "//gpu/command_buffer/service",
+ "//gpu/ipc/common",
+ "//gpu/skia_bindings",
+ "//ipc",
+ "//ipc/mojo",
+ "//media",
+ "//media:shared_memory_support",
+ "//media/midi",
+ "//mojo/common:common_base",
"//mojo/converters/network",
+ "//mojo/edk/system",
"//mojo/shell/public/cpp",
+ "//mojo/shell/public/interfaces",
"//mojo/shell/runner/common",
"//net",
+ "//sandbox",
"//skia",
+ "//storage/common",
"//third_party/WebKit/public:blink",
+ "//third_party/boringssl",
"//third_party/icu",
"//third_party/libjingle",
"//ui/accessibility",
@@ -168,43 +193,12 @@ source_set("common") {
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gfx/ipc",
+ "//ui/gl",
"//ui/shell_dialogs",
"//url",
"//url/ipc:url_ipc",
]
- if (!is_ios) {
- deps += [
- "//cc",
- "//device/bluetooth",
- "//ipc",
- "//ipc/mojo",
-
- # TODO: the dependency on gl_in_process_context should be decoupled from
- # content and moved to android_webview. See crbug.com/365797.
- "//gpu/blink",
- "//gpu/command_buffer/client:gl_in_process_context",
- "//gpu/command_buffer/client:gles2_c_lib",
- "//gpu/command_buffer/client:gles2_cmd_helper",
- "//gpu/command_buffer/client:gles2_implementation",
- "//gpu/command_buffer/service",
- "//gpu/ipc/common",
- "//gpu/skia_bindings",
- "//media",
- "//media:shared_memory_support",
- "//media/midi",
- "//mojo/common:common_base",
- "//mojo/edk/system",
- "//mojo/shell/public/interfaces",
- "//sandbox",
- "//storage/common",
- "//third_party/boringssl",
- "//ui/gl",
- ]
-
- public_deps += [ ":mojo_bindings" ]
- }
-
defines = []
include_dirs = []
libs = []
@@ -274,11 +268,6 @@ source_set("common") {
deps += [ "//ppapi/proxy:ipc_sources" ]
}
- if (is_ios) {
- sources -= [ "user_agent.cc" ]
- assert(false, "Need to add lots of conditions here")
- }
-
if (use_ozone) {
configs += [ "//ui/ozone:vgem_map" ]
« no previous file with comments | « content/child/BUILD.gn ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698