| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//content/common/common.gni") | 7 import("//content/common/common.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 | 9 |
| 10 source_set("common") { | 10 source_set("common") { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 "//ui/gfx/geometry", | 38 "//ui/gfx/geometry", |
| 39 "//url", | 39 "//url", |
| 40 "//third_party/WebKit/public:blink_headers", | 40 "//third_party/WebKit/public:blink_headers", |
| 41 # TODO(GYP) convert these dependencies. | 41 # TODO(GYP) convert these dependencies. |
| 42 #'../third_party/libjingle/libjingle.gyp:libjingle', | 42 #'../third_party/libjingle/libjingle.gyp:libjingle', |
| 43 #'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', | 43 #'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', |
| 44 ] | 44 ] |
| 45 | 45 |
| 46 if (!is_ios) { | 46 if (!is_ios) { |
| 47 deps += [ | 47 deps += [ |
| 48 "//cc", |
| 48 "//ipc", | 49 "//ipc", |
| 50 "//mojo/environment:chromium", |
| 51 "//mojo/system", |
| 52 # TODO: the dependency on gl_in_process_context should be decoupled from |
| 53 # content and moved to android_webview. See crbug.com/365797. |
| 54 "//gpu/command_buffer/client:gl_in_process_context", |
| 49 "//gpu/command_buffer/client:gles2_c_lib", | 55 "//gpu/command_buffer/client:gles2_c_lib", |
| 50 "//gpu/command_buffer/client:gles2_implementation", | 56 "//gpu/command_buffer/client:gles2_implementation", |
| 57 "//gpu/command_buffer/service", |
| 58 "//gpu/ipc", |
| 51 "//ui/gl", | 59 "//ui/gl", |
| 52 #'../cc/cc.gyp:cc', | 60 "//webkit/browser:storage", |
| 53 #'../gpu/gpu.gyp:command_buffer_service', | 61 "//webkit/common", |
| 54 # TODO: the dependency on gl_in_process_context should be decoupled from | 62 "//webkit/common:storage", |
| 55 # content and moved to android_webview. See crbug.com/365797. | 63 "//webkit/common/gpu", |
| 56 #'../gpu/gpu.gyp:gl_in_process_context', | 64 #'../gpu/gpu.gyp:gl_in_process_context', |
| 57 #'../gpu/gpu.gyp:gpu_ipc', | |
| 58 #'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', | 65 #'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', |
| 59 #'../media/media.gyp:media', | 66 #'../media/media.gyp:media', |
| 60 #'../media/media.gyp:shared_memory_support', | 67 #'../media/media.gyp:shared_memory_support', |
| 61 #'../mojo/mojo.gyp:mojo_environment_chromium', | |
| 62 #'../mojo/mojo.gyp:mojo_system_impl', | |
| 63 #'../third_party/WebKit/public/blink.gyp:blink', | 68 #'../third_party/WebKit/public/blink.gyp:blink', |
| 64 #'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', | |
| 65 #'../webkit/common/webkit_common.gyp:webkit_common', | |
| 66 #'../webkit/storage_browser.gyp:webkit_storage_browser', | |
| 67 #'../webkit/storage_common.gyp:webkit_storage_common', | |
| 68 ] | 69 ] |
| 69 } | 70 } |
| 70 | 71 |
| 71 defines = [] | 72 defines = [] |
| 72 include_dirs = [] | 73 include_dirs = [] |
| 73 libs = [] | 74 libs = [] |
| 74 ldflags = [] | 75 ldflags = [] |
| 75 | 76 |
| 76 if (is_android && use_seccomp_bpf) { | 77 if (is_android && use_seccomp_bpf) { |
| 77 set_sources_assignment_filter([]) | 78 set_sources_assignment_filter([]) |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 if (cpu_arch != "arm" || !is_chromeos) { | 150 if (cpu_arch != "arm" || !is_chromeos) { |
| 150 sources +=[ | 151 sources +=[ |
| 151 "gpu/x_util.cc", | 152 "gpu/x_util.cc", |
| 152 "gpu/x_util.h", | 153 "gpu/x_util.h", |
| 153 ] | 154 ] |
| 154 } | 155 } |
| 155 } | 156 } |
| 156 | 157 |
| 157 if (enable_plugins) { | 158 if (enable_plugins) { |
| 158 deps += [ | 159 deps += [ |
| 159 # TODO(GYP) enable once supported in the GN build. | 160 "//ppapi:ppapi_shared", |
| 160 #"//ppapi:shared", | |
| 161 ] | 161 ] |
| 162 } else { | 162 } else { |
| 163 sources -= [ | 163 sources -= [ |
| 164 "pepper_plugin_list.cc", | 164 "pepper_plugin_list.cc", |
| 165 "pepper_plugin_list.h", | 165 "pepper_plugin_list.h", |
| 166 "sandbox_util.cc", | 166 "sandbox_util.cc", |
| 167 ] | 167 ] |
| 168 } | 168 } |
| 169 | 169 |
| 170 if (is_android) { | 170 if (is_android) { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 ] | 260 ] |
| 261 } | 261 } |
| 262 } | 262 } |
| 263 } | 263 } |
| 264 | 264 |
| 265 mojom("mojo_bindings") { | 265 mojom("mojo_bindings") { |
| 266 sources = [ | 266 sources = [ |
| 267 "web_ui_setup.mojom", | 267 "web_ui_setup.mojom", |
| 268 ] | 268 ] |
| 269 } | 269 } |
| OLD | NEW |