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

Side by Side Diff: 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: clean up for review Created 5 years, 10 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 | « no previous file | base/BUILD.gn » ('j') | base/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # This is the root build file for GN. GN will start processing by loading this 5 # This is the root build file for GN. GN will start processing by loading this
6 # file, and recursively load all dependencies until all dependencies are either 6 # file, and recursively load all dependencies until all dependencies are either
7 # resolved or known not to exist (which will cause the build to fail). So if 7 # resolved or known not to exist (which will cause the build to fail). So if
8 # you add a new build file, there must be some path of dependencies from this 8 # you add a new build file, there must be some path of dependencies from this
9 # file to your new one or GN won't know about it. 9 # file to your new one or GN won't know about it.
10 10
11 import("//build/config/features.gni")
11 import("//build/config/ui.gni") 12 import("//build/config/ui.gni")
13
12 if (is_android) { 14 if (is_android) {
13 import("//build/config/android/config.gni") 15 import("//build/config/android/config.gni")
14 } 16 }
15 17
16 declare_args() { 18 declare_args() {
17 # A list of extra dependencies to add to the root target. This allows a 19 # A list of extra dependencies to add to the root target. This allows a
18 # checkout to add additional targets without explicitly changing any checked- 20 # checkout to add additional targets without explicitly changing any checked-
19 # in files. 21 # in files.
20 root_extra_deps = [] 22 root_extra_deps = []
21 } 23 }
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 } 156 }
155 157
156 if (use_x11) { 158 if (use_x11) {
157 deps += [ "//tools/xdisplaycheck" ] 159 deps += [ "//tools/xdisplaycheck" ]
158 } 160 }
159 161
160 if (use_aura) { 162 if (use_aura) {
161 deps += [ "//ui/wm" ] 163 deps += [ "//ui/wm" ]
162 } 164 }
163 165
166 if (enable_nacl && enable_nacl_untrusted) {
167 if (is_linux && cpu_arch == "x64") {
Nick Bray (chromium) 2015/02/05 23:21:45 Are you not supporting x86 at this point? TODO?
Dirk Pranke 2015/02/05 23:52:19 Correct (only x64). I will add a TODO.
168 deps += [ "//ppapi:ppapi_cpp_lib(//native_client/build/toolchain/nacl:clan g_newlib_x64)" ]
169 }
170 }
171
164 if (is_win) { 172 if (is_win) {
165 deps += [ "//ui/metro_viewer" ] 173 deps += [ "//ui/metro_viewer" ]
166 } 174 }
167 175
168 if (is_win || is_mac || is_chromeos) { 176 if (is_win || is_mac || is_chromeos) {
169 # RLZ works on these platforms. 177 # RLZ works on these platforms.
170 deps += [ "//rlz:rlz_lib" ] 178 deps += [ "//rlz:rlz_lib" ]
171 } 179 }
172 180
173 if (cpu_arch == "x86" || cpu_arch == "x64") { 181 if (cpu_arch == "x86" || cpu_arch == "x64") {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 "//ui/views", 303 "//ui/views",
296 "//ui/views/controls/webview", 304 "//ui/views/controls/webview",
297 "//ui/web_dialogs", 305 "//ui/web_dialogs",
298 ] 306 ]
299 } 307 }
300 308
301 if (is_mac || is_ios) { 309 if (is_mac || is_ios) {
302 deps -= [ "//ui/touch_selection" ] 310 deps -= [ "//ui/touch_selection" ]
303 } 311 }
304 } 312 }
OLDNEW
« no previous file with comments | « no previous file | base/BUILD.gn » ('j') | base/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698