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

Side by Side Diff: build/config/nacl/rules.gni

Issue 1449223002: GN: Use NaCl's newlib objdump for PNaCl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODO comment 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 | « no previous file | no next file » | 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 Native Client Authors. All rights reserved. 1 # Copyright 2015 The Native Client 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 7
8 # Generate a nmf file 8 # Generate a nmf file
9 # 9 #
10 # Native Client Manifest (nmf) is a JSON file that tells the browser where to 10 # Native Client Manifest (nmf) is a JSON file that tells the browser where to
(...skipping 18 matching lines...) Expand all
29 "data_deps", 29 "data_deps",
30 "executables", 30 "executables",
31 "lib_prefix", 31 "lib_prefix",
32 "nmf", 32 "nmf",
33 "nmfflags", 33 "nmfflags",
34 "public_deps", 34 "public_deps",
35 "stage_dependencies", 35 "stage_dependencies",
36 "testonly", 36 "testonly",
37 ]) 37 ])
38 38
39 objdump = rebase_path("${nacl_toolprefix}objdump") 39 # TODO(phosek): Remove this conditional once
40 # https://bugs.chromium.org/p/nativeclient/issues/detail?id=4339 is
41 # resolved.
42 if (current_cpu == "pnacl") {
43 objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump")
44 } else {
45 objdump = rebase_path("${nacl_toolprefix}objdump")
46 }
40 if (host_os == "win") { 47 if (host_os == "win") {
41 objdump += ".exe" 48 objdump += ".exe"
42 } 49 }
43 50
44 script = "//native_client_sdk/src/tools/create_nmf.py" 51 script = "//native_client_sdk/src/tools/create_nmf.py"
45 inputs = [ 52 inputs = [
46 objdump, 53 objdump,
47 ] 54 ]
48 sources = executables 55 sources = executables
49 outputs = [ 56 outputs = [
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } else { 145 } else {
139 arch = target_cpu 146 arch = target_cpu
140 } 147 }
141 args = [ 148 args = [
142 "--program=" + rebase_path(executable, root_build_dir), 149 "--program=" + rebase_path(executable, root_build_dir),
143 "--arch=${arch}", 150 "--arch=${arch}",
144 "--output=" + rebase_path(nmf, root_build_dir), 151 "--output=" + rebase_path(nmf, root_build_dir),
145 ] 152 ]
146 } 153 }
147 } 154 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698