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

Side by Side Diff: components/nacl/loader/BUILD.gn

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/mus/ws/BUILD.gn ('k') | components/nacl/loader/DEPS » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/nacl/config.gni") 6 import("//build/config/nacl/config.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 assert(enable_nacl) 9 assert(enable_nacl)
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 ] 54 ]
55 } 55 }
56 56
57 source_set("loader") { 57 source_set("loader") {
58 public_deps = [ 58 public_deps = [
59 ":minimal", 59 ":minimal",
60 ] 60 ]
61 deps = [ 61 deps = [
62 "//components/nacl/common", 62 "//components/nacl/common",
63 "//content/public/common", 63 "//content/public/common",
64 "//mojo/edk/system",
64 "//ppapi/shared_impl", 65 "//ppapi/shared_impl",
65 "//third_party/mojo/src/mojo/edk/system",
66 ] 66 ]
67 67
68 if (enable_nacl_untrusted) { 68 if (enable_nacl_untrusted) {
69 data_deps = [ 69 data_deps = [
70 "//ppapi/native_client:irt", 70 "//ppapi/native_client:irt",
71 ] 71 ]
72 } 72 }
73 if (enable_pnacl) { 73 if (enable_pnacl) {
74 data_deps += 74 data_deps +=
75 [ "//ppapi/native_client/src/untrusted/pnacl_support_extension" ] 75 [ "//ppapi/native_client/src/untrusted/pnacl_support_extension" ]
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 "${root_out_dir}/nacl_helper_nonsfi_unittests_main", 304 "${root_out_dir}/nacl_helper_nonsfi_unittests_main",
305 ] 305 ]
306 outputs = [ 306 outputs = [
307 "${root_build_dir}/{{source_file_part}}", 307 "${root_build_dir}/{{source_file_part}}",
308 ] 308 ]
309 deps = [ 309 deps = [
310 ":nacl_helper_nonsfi_unittests_main", 310 ":nacl_helper_nonsfi_unittests_main",
311 ] 311 ]
312 } 312 }
313 } 313 }
OLDNEW
« no previous file with comments | « components/mus/ws/BUILD.gn ('k') | components/nacl/loader/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698