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

Unified Diff: mojo/nacl/BUILD.gn

Issue 1351593002: Rolling deps, making mojo work with new NaCl gn setup. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Resolving merge conflict in DEPS Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/toolchain.gni ('k') | nacl_bindings/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/nacl/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index 6ae4263e533ba0e8b40b65186473aded808ffb58..1e7bf072e4ceff0f585289c82181d8e10e0b5bd6 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -17,7 +17,8 @@ if (!is_nacl) {
"//nacl_bindings:monacl_sel",
]
- data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${target_cpu})" ]
+ data_deps =
+ [ "//nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
}
if (current_cpu == "x86") {
@@ -111,14 +112,14 @@ group("mojo_nacl") {
group("mojo_pnacl_tests") {
testonly = true
deps = [
- ":monacl_test(//native_client/build/toolchain/nacl:newlib_pnacl)",
+ ":monacl_test(//build/toolchain/nacl:newlib_pnacl)",
]
}
group("mojo_nacl_tests") {
testonly = true
deps = [
- ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
+ ":mojo_nacl_tests_untrusted(//build/toolchain/nacl:clang_newlib_${current_cpu})",
":monacl_shell",
":monacl_shell_nonsfi_x86",
":mojo_pnacl_tests",
« no previous file with comments | « build/toolchain/toolchain.gni ('k') | nacl_bindings/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698