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

Side by Side Diff: content/shell/BUILD.gn

Issue 808573003: Make devtools use common generated blink source directory instead of gen/webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing the landmine. Created 6 years 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 unified diff | Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | extensions/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698