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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « build/config/features.gni ('k') | remoting/host/it2me/BUILD.gn » ('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 6
7 if (enable_nacl && enable_nacl_untrusted && enable_pnacl) { 7 if (enable_nacl && enable_nacl_untrusted && enable_pnacl) {
8 # This target copies files from the prebuilt/DEPS'ed in pnacl_translator 8 # This target copies files from the prebuilt/DEPS'ed in pnacl_translator
9 # toolchain and copies the latest PNaCl IRT shim library. 9 # toolchain and copies the latest PNaCl IRT shim library.
10 # We could use 'copies', but we want to rename the files in a white-listed 10 # We could use 'copies', but we want to rename the files in a white-listed
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 94 }
95 } else { 95 } else {
96 assert(false, "unhandled target_cpu") 96 assert(false, "unhandled target_cpu")
97 } 97 }
98 args = [ 98 args = [
99 "--dest", 99 "--dest",
100 rebase_path("$root_out_dir/pnacl", root_build_dir), 100 rebase_path("$root_out_dir/pnacl", root_build_dir),
101 ] 101 ]
102 args += shim_override_args 102 args += shim_override_args
103 103
104 if (current_os == "chromeos") {
105 toolchain_os = "linux"
106 } else {
107 toolchain_os = current_os
108 }
109
104 args += [ 110 args += [
105 "--target_arch", 111 "--target_arch",
106 target_cpu, 112 target_cpu,
107 "--info_template_path", 113 "--info_template_path",
108 rebase_path("//native_client/pnacl/driver/pnacl_info_template.json", 114 rebase_path("//native_client/pnacl/driver/pnacl_info_template.json",
109 root_build_dir), 115 root_build_dir),
110 "--pnacl_translator_path", 116 "--pnacl_translator_path",
111 rebase_path( 117 rebase_path(
112 "//native_client/toolchain/${current_os}_x86/pnacl_translator", 118 "//native_client/toolchain/${toolchain_os}_x86/pnacl_translator",
113 root_build_dir), 119 root_build_dir),
114 "--package_version_path", 120 "--package_version_path",
115 rebase_path("//native_client/build/package_version/package_version.py", 121 rebase_path("//native_client/build/package_version/package_version.py",
116 root_build_dir), 122 root_build_dir),
117 "--pnacl_package_name", 123 "--pnacl_package_name",
118 "pnacl_translator", 124 "pnacl_translator",
119 125
120 # ABI Version Number 126 # ABI Version Number
121 "1", 127 "1",
122 ] 128 ]
123 } 129 }
124 } 130 }
OLDNEW
« no previous file with comments | « build/config/features.gni ('k') | remoting/host/it2me/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698