ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn - Issue 1417823006: Build NaCl in the CrOS GN builds and make sure "all" works

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn

Issue 1417823006: Build NaCl in the CrOS GN builds and make sure "all" works (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase and make sure "all" works also (fix remoting) Created 5 years, 1 month 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

Index: ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn

diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn

index a502f98bada4497f7bbdab0b4fa237ddffc05e7e..34f826c4a8dbffa3aaee517410a8868609ce494e 100644

--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn

+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn

@@ -101,6 +101,12 @@ if (enable_nacl && enable_nacl_untrusted && enable_pnacl) {

]

args += shim_override_args

+ if (current_os == "chromeos") {

+ toolchain_os = "linux"

+ } else {

+ toolchain_os = current_os

+ }

args += [

"--target_arch",

target_cpu,

@@ -109,7 +115,7 @@ if (enable_nacl && enable_nacl_untrusted && enable_pnacl) {

root_build_dir),

"--pnacl_translator_path",

rebase_path(

- "//native_client/toolchain/${current_os}_x86/pnacl_translator",

+ "//native_client/toolchain/${toolchain_os}_x86/pnacl_translator",

root_build_dir),

"--package_version_path",

rebase_path("//native_client/build/package_version/package_version.py",

« no previous file with comments | « build/config/features.gni ('k') | remoting/host/it2me/BUILD.gn » ('j') | no next file with comments »