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

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

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet more feedback Created 5 years, 9 months 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/nacl/renderer/plugin/BUILD.gn ('k') | ipc/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("//extensions/shell/app_shell.gni") 5 import("//extensions/shell/app_shell.gni")
6 6
7 # Technically, this directory should not depend on files from src/chrome, but 7 # Technically, this directory should not depend on files from src/chrome, but
8 # that's where the VERSION file is. This should probably all be moved to 8 # that's where the VERSION file is. This should probably all be moved to
9 # src/build. 9 # src/build.
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 "//components/nacl:renderer", 98 "//components/nacl:renderer",
99 "//components/nacl:switches", 99 "//components/nacl:switches",
100 ] 100 ]
101 nacl_sources = 101 nacl_sources =
102 rebase_path(app_shell_gypi_values.app_shell_lib_sources_nacl, 102 rebase_path(app_shell_gypi_values.app_shell_lib_sources_nacl,
103 ".", 103 ".",
104 "//extensions/shell") 104 "//extensions/shell")
105 sources += nacl_sources 105 sources += nacl_sources
106 } 106 }
107 } 107 }
108
109 if (enable_nacl) {
110 sources += [
111 "browser/shell_nacl_browser_delegate.cc",
112 "browser/shell_nacl_browser_delegate.h",
113 ]
114
115 deps += [
116 "//components/nacl",
117 "//components/nacl:nacl_browser",
118 "//components/nacl:nacl_common",
119 "//components/nacl:nacl_renderer",
120 "//components/nacl:nacl_switches",
121 "//components/nacl/renderer/plugin:nacl_trusted_plugin",
122 ]
123
124 if (is_linux) {
125 deps += [ "//components/nacl:nacl_helper" ]
126 }
127 }
108 } 128 }
109 129
110 if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) { 130 if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) {
111 executable("app_shell") { 131 executable("app_shell") {
112 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. 132 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment.
113 testonly = true 133 testonly = true
114 sources = rebase_path(app_shell_gypi_values.app_shell_sources, 134 sources = rebase_path(app_shell_gypi_values.app_shell_sources,
115 ".", 135 ".",
116 "//extensions/shell") 136 "//extensions/shell")
117 deps = [ 137 deps = [
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 199
180 if (is_win) { 200 if (is_win) {
181 deps += [ "//base/allocator" ] 201 deps += [ "//base/allocator" ]
182 } 202 }
183 } 203 }
184 204
185 process_version("version_header") { 205 process_version("version_header") {
186 template_file = "common/version.h.in" 206 template_file = "common/version.h.in"
187 output = "$target_gen_dir/common/version.h" 207 output = "$target_gen_dir/common/version.h"
188 } 208 }
OLDNEW
« no previous file with comments | « components/nacl/renderer/plugin/BUILD.gn ('k') | ipc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698