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

Side by Side Diff: content/browser/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 | « components/components_tests.gyp ('k') | content/browser/devtools/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("//content/browser/browser.gni") 7 import("//content/browser/browser.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 9
10 source_set("browser") { 10 source_set("browser") {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 # TODO(GYP) these generated files are listed as sources in content_browser. 75 # TODO(GYP) these generated files are listed as sources in content_browser.
76 # This is a bit suspicious. The GN grit template will make a source set 76 # This is a bit suspicious. The GN grit template will make a source set
77 # containing the generated code so it should be sufficient to just depend 77 # containing the generated code so it should be sufficient to just depend
78 # on the grit rule. But maybe some of these will need to be added? 78 # on the grit rule. But maybe some of these will need to be added?
79 # 79 #
80 # Need this annoying rebase_path call to match what happened with the 80 # Need this annoying rebase_path call to match what happened with the
81 # sources. 81 # sources.
82 sources -= rebase_path( 82 sources -= rebase_path(
83 [ 83 [
84 "$root_gen_dir/webkit/grit/devtools_resources.h", 84 "$root_gen_dir/blink/grit/devtools_resources.h",
85 "$root_gen_dir/webkit/grit/devtools_resources_map.cc", 85 "$root_gen_dir/blink/grit/devtools_resources_map.cc",
86 "$root_gen_dir/webkit/grit/devtools_resources_map.h", 86 "$root_gen_dir/blink/grit/devtools_resources_map.h",
87 "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h", 87 "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
88 "$root_gen_dir/ui/resources/grit/webui_resources_map.cc", 88 "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
89 "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol _dispatcher.cc", 89 "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol _dispatcher.cc",
90 "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol _dispatcher.h", 90 "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol _dispatcher.h",
91 ], 91 ],
92 ".") 92 ".")
93 93
94 # Non-iOS deps. 94 # Non-iOS deps.
95 deps += [ 95 deps += [
96 "//cc", 96 "//cc",
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 429
430 if (enable_browser_cdms) { 430 if (enable_browser_cdms) {
431 sources += [ 431 sources += [
432 "media/cdm/browser_cdm_manager.cc", 432 "media/cdm/browser_cdm_manager.cc",
433 "media/cdm/browser_cdm_manager.h", 433 "media/cdm/browser_cdm_manager.h",
434 "media/media_web_contents_observer.cc", 434 "media/media_web_contents_observer.cc",
435 "media/media_web_contents_observer.h", 435 "media/media_web_contents_observer.h",
436 ] 436 ]
437 } 437 }
438 } 438 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | content/browser/devtools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698