| OLD | NEW |
| 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 16 matching lines...) Expand all Loading... |
| 27 [ | 27 [ |
| 28 "deps", | 28 "deps", |
| 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 "visibility", |
| 37 ]) | 38 ]) |
| 38 | 39 |
| 39 # TODO(phosek): Remove this conditional once | 40 # TODO(phosek): Remove this conditional once |
| 40 # https://bugs.chromium.org/p/nativeclient/issues/detail?id=4339 is | 41 # https://bugs.chromium.org/p/nativeclient/issues/detail?id=4339 is |
| 41 # resolved. | 42 # resolved. |
| 42 if (current_cpu == "pnacl") { | 43 if (current_cpu == "pnacl") { |
| 43 objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump") | 44 objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump") |
| 44 } else { | 45 } else { |
| 45 objdump = rebase_path("${nacl_toolprefix}objdump") | 46 objdump = rebase_path("${nacl_toolprefix}objdump") |
| 46 } | 47 } |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } else { | 146 } else { |
| 146 arch = target_cpu | 147 arch = target_cpu |
| 147 } | 148 } |
| 148 args = [ | 149 args = [ |
| 149 "--program=" + rebase_path(executable, root_build_dir), | 150 "--program=" + rebase_path(executable, root_build_dir), |
| 150 "--arch=${arch}", | 151 "--arch=${arch}", |
| 151 "--output=" + rebase_path(nmf, root_build_dir), | 152 "--output=" + rebase_path(nmf, root_build_dir), |
| 152 ] | 153 ] |
| 153 } | 154 } |
| 154 } | 155 } |
| OLD | NEW |