| 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/repack.gni") | 7 import("//tools/grit/repack.gni") |
| 8 import("//tools/grit/grit_rule.gni") | 8 import("//tools/grit/grit_rule.gni") |
| 9 if (is_android) { | 9 if (is_android) { |
| 10 import("//build/config/android/config.gni") | 10 import("//build/config/android/config.gni") |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 "//content:resources", | 463 "//content:resources", |
| 464 "//content/app/resources", | 464 "//content/app/resources", |
| 465 "//content/app/strings", | 465 "//content/app/strings", |
| 466 "//content/browser/tracing:resources", | 466 "//content/browser/tracing:resources", |
| 467 "//net:net_resources", | 467 "//net:net_resources", |
| 468 "//third_party/WebKit/public:resources", | 468 "//third_party/WebKit/public:resources", |
| 469 "//ui/resources", | 469 "//ui/resources", |
| 470 "//ui/strings", | 470 "//ui/strings", |
| 471 ] | 471 ] |
| 472 | 472 |
| 473 sources += [ "$root_gen_dir/webkit/devtools_resources.pak" ] | 473 sources += [ "$root_gen_dir/blink/devtools_resources.pak" ] |
| 474 deps += [ "//content/browser/devtools:resources" ] | 474 deps += [ "//content/browser/devtools:resources" ] |
| 475 output = "$root_out_dir/content_shell.pak" | 475 output = "$root_out_dir/content_shell.pak" |
| 476 } | 476 } |
| 477 | 477 |
| 478 # TODO(GYP): Figure out what this should be on android | 478 # TODO(GYP): Figure out what this should be on android |
| 479 # and make linking this work on the Mac. | 479 # and make linking this work on the Mac. |
| 480 if (!is_android && !is_mac) { | 480 if (!is_android && !is_mac) { |
| 481 executable("content_shell") { | 481 executable("content_shell") { |
| 482 testonly = true | 482 testonly = true |
| 483 | 483 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 511 | 511 |
| 512 if (is_android && !is_android_webview_build) { | 512 if (is_android && !is_android_webview_build) { |
| 513 # Some tests rely on this tool. It might be nicer if these tests relied on | 513 # Some tests rely on this tool. It might be nicer if these tests relied on |
| 514 # image diff rather than having content shell depend on it. | 514 # image diff rather than having content shell depend on it. |
| 515 datadeps = [ | 515 datadeps = [ |
| 516 "//tools/imagediff($host_toolchain)", | 516 "//tools/imagediff($host_toolchain)", |
| 517 ] | 517 ] |
| 518 } | 518 } |
| 519 } | 519 } |
| 520 } | 520 } |
| OLD | NEW |