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

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: merge to #317924 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
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 deps += [ "//ui/wm:wm_unittests" ] 157 deps += [ "//ui/wm:wm_unittests" ]
158 } 158 }
159 159
160 if (use_ozone) { 160 if (use_ozone) {
161 deps += [ 161 deps += [
162 "//ui/ozone", 162 "//ui/ozone",
163 "//ui/ozone/demo", # GN only 163 "//ui/ozone/demo", # GN only
164 ] 164 ]
165 } 165 }
166 166
167 if (enable_nacl && enable_nacl_untrusted) {
168 if (is_linux && current_cpu == "x64") {
169 # TODO(GYP): Add the right deps for the other architectures.
170 # TODO(dpranke) needed? deps += [ "//ppapi:ppapi_cpp_lib(//native_client/b uild/toolchain/nacl:clang_newlib_x64)" ]
Dirk Pranke 2015/02/25 21:08:46 It looks like we don't need to explicitly build th
brettw 2015/02/25 21:27:29 Yes, remove this.
171 }
172 }
173
167 if (is_win || is_mac || is_chromeos) { 174 if (is_win || is_mac || is_chromeos) {
168 # RLZ works on these platforms. 175 # RLZ works on these platforms.
169 # TODO(GYP): Is this target needed, or pulled in automatically? 176 # TODO(GYP): Is this target needed, or pulled in automatically?
170 deps += [ "//rlz:rlz_lib" ] 177 deps += [ "//rlz:rlz_lib" ]
171 } 178 }
172 179
173 if (is_android) { 180 if (is_android) {
174 deps += [ 181 deps += [
175 "//base/android/linker:chromium_android_linker", 182 "//base/android/linker:chromium_android_linker",
176 "//build/android/gyp/test:hello_world", 183 "//build/android/gyp/test:hello_world",
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 "//ui/gfx:gfx_unittests", # TODO(GYP) 298 "//ui/gfx:gfx_unittests", # TODO(GYP)
292 ] 299 ]
293 } else if (is_win) { 300 } else if (is_win) {
294 deps += [ "//ui/metro_viewer" ] 301 deps += [ "//ui/metro_viewer" ]
295 deps -= [ 302 deps -= [
296 "//crypto:crypto_unittests", # TODO(GYP) 303 "//crypto:crypto_unittests", # TODO(GYP)
297 "//net:net_unittests", # TODO(GYP) 304 "//net:net_unittests", # TODO(GYP)
298 ] 305 ]
299 } 306 }
300 } 307 }
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