| 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("//tools/grit/grit_rule.gni") | 7 import("//tools/grit/grit_rule.gni") |
| 8 import("//tools/grit/repack.gni") | 8 import("//tools/grit/repack.gni") |
| 9 if (is_android) { | 9 if (is_android) { |
| 10 import("//build/config/android/config.gni") | 10 import("//build/config/android/config.gni") |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 | 192 |
| 193 defines = [ "CONTENT_SHELL_VERSION=\"$content_shell_version\"" ] | 193 defines = [ "CONTENT_SHELL_VERSION=\"$content_shell_version\"" ] |
| 194 | 194 |
| 195 deps = [ | 195 deps = [ |
| 196 ":resources", | 196 ":resources", |
| 197 "//base", | 197 "//base", |
| 198 "//base:base_static", | 198 "//base:base_static", |
| 199 "//base/allocator", | 199 "//base/allocator", |
| 200 "//base/third_party/dynamic_annotations", | 200 "//base/third_party/dynamic_annotations", |
| 201 "//cc", | 201 "//cc", |
| 202 "//components/breakpad/app", |
| 202 "//content:resources", | 203 "//content:resources", |
| 203 "//content/gpu", | 204 "//content/gpu", |
| 204 "//content/ppapi_plugin", | 205 "//content/ppapi_plugin", |
| 205 "//content/public/browser", | 206 "//content/public/browser", |
| 206 "//content/public/common", | 207 "//content/public/common", |
| 207 "//content/public/plugin", | 208 "//content/public/plugin", |
| 208 "//content/public/renderer", | 209 "//content/public/renderer", |
| 209 "//content/public/utility", | 210 "//content/public/utility", |
| 210 "//content/worker", | 211 "//content/worker", |
| 211 "//content/test:layouttest_support", | 212 "//content/test:layouttest_support", |
| (...skipping 11 matching lines...) Expand all Loading... |
| 223 "//ui/gfx", | 224 "//ui/gfx", |
| 224 "//ui/gfx/geometry", | 225 "//ui/gfx/geometry", |
| 225 "//ui/gfx/ipc", | 226 "//ui/gfx/ipc", |
| 226 "//ui/gl", | 227 "//ui/gl", |
| 227 "//url", | 228 "//url", |
| 228 "//v8", | 229 "//v8", |
| 229 "//webkit:resources", | 230 "//webkit:resources", |
| 230 "//webkit/browser:storage", | 231 "//webkit/browser:storage", |
| 231 #'content.gyp:content_app_both', TODO(GYP) | 232 #'content.gyp:content_app_both', TODO(GYP) |
| 232 #'copy_test_netscape_plugin', TODO(GYP) | 233 #'copy_test_netscape_plugin', TODO(GYP) |
| 233 #'../components/components.gyp:breakpad_component', TODO(GYP) | |
| 234 #'../third_party/WebKit/public/blink.gyp:blink_test_support', TODO(GYP) | 234 #'../third_party/WebKit/public/blink.gyp:blink_test_support', TODO(GYP) |
| 235 ] | 235 ] |
| 236 | 236 |
| 237 if (is_win) { | 237 if (is_win) { |
| 238 configs -= [ "//build/config/win:console" ] | 238 configs -= [ "//build/config/win:console" ] |
| 239 configs += [ "//build/config/win:windowed" ] | 239 configs += [ "//build/config/win:windowed" ] |
| 240 deps += [ "//webkit/resources" ] | 240 deps += [ "//webkit/resources" ] |
| 241 #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP) | 241 #'LinkIncremental': '<(msvs_large_module_debug_link_mode)', TODO(GYP) |
| 242 | 242 |
| 243 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 243 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 244 cflags = [ "/wd4267" ] | 244 cflags = [ "/wd4267" ] |
| 245 } | 245 } |
| 246 | 246 |
| 247 if (is_linux) { | 247 if (is_linux) { |
| 248 configs += [ "//build/config/linux:fontconfig" ] | 248 configs += [ "//build/config/linux:fontconfig" ] |
| 249 } | 249 } |
| 250 | 250 |
| 251 if (use_x11) { | 251 if (use_x11) { |
| 252 # TODO(GYP) The GYP build includes a dep on the xdisplaycheck executable. | 252 # TODO(GYP) The GYP build includes a dep on the xdisplaycheck executable. |
| 253 # Track down who added this and ask them if it's necessary, since this | 253 # Track down who added this and ask them if it's necessary, since this |
| 254 # seems suspicious. | 254 # seems suspicious. |
| 255 } | 255 } |
| 256 | 256 |
| 257 if (is_android) { | 257 if (is_android) { |
| 258 #deps += [ 'content_shell_jni_headers' ] TODO(GYP) | 258 #deps += [ 'content_shell_jni_headers' ] TODO(GYP) |
| 259 #deps -= [ 'copy_test_netscape_plugin' ] TODO(GYP) | 259 #deps -= [ 'copy_test_netscape_plugin' ] TODO(GYP) |
| 260 } | 260 } |
| 261 | 261 |
| 262 if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) { | 262 if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) { |
| 263 #deps += [ '../components/components.gyp:breakpad_host' ] TODO(GYP | 263 deps += [ "//components/breakpad/browser" ] |
| 264 } | 264 } |
| 265 | 265 |
| 266 if (use_aura) { | 266 if (use_aura) { |
| 267 deps += [ | 267 deps += [ |
| 268 "//ui/aura", | 268 "//ui/aura", |
| 269 "//ui/aura:test_support", | 269 "//ui/aura:test_support", |
| 270 "//ui/events", | 270 "//ui/events", |
| 271 "//ui/strings", | 271 "//ui/strings", |
| 272 "//ui/wm", | 272 "//ui/wm", |
| 273 ] | 273 ] |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 #'../tools/imagediff/image_diff.gyp:image_diff', TODO(GYP) | 458 #'../tools/imagediff/image_diff.gyp:image_diff', TODO(GYP) |
| 459 ] | 459 ] |
| 460 } | 460 } |
| 461 } | 461 } |
| 462 | 462 |
| 463 } else { | 463 } else { |
| 464 # Content shell not ready, make a dummpy to make dependency management easier. | 464 # Content shell not ready, make a dummpy to make dependency management easier. |
| 465 group("content_shell") { | 465 group("content_shell") { |
| 466 } | 466 } |
| 467 } | 467 } |
| OLD | NEW |