| OLD | NEW |
| 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/nacl/rules.gni") | 5 import("//build/config/nacl/rules.gni") |
| 6 | 6 |
| 7 assert(enable_nacl) | 7 assert(enable_nacl) |
| 8 | 8 |
| 9 if (current_cpu == "pnacl") { | 9 if (current_cpu == "pnacl") { |
| 10 if (is_nacl_nonsfi) { | 10 if (is_nacl_nonsfi) { |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 } | 221 } |
| 222 } else { | 222 } else { |
| 223 # TODO(phosek): remove the following once change 1360243003 is rolled | 223 # TODO(phosek): remove the following once change 1360243003 is rolled |
| 224 # into Chrome and use translate_cpu directly. | 224 # into Chrome and use translate_cpu directly. |
| 225 if (translate_cpu == "x86") { | 225 if (translate_cpu == "x86") { |
| 226 arch = "i686" | 226 arch = "i686" |
| 227 } else if (translate_cpu == "x64") { | 227 } else if (translate_cpu == "x64") { |
| 228 arch = "x86-64" | 228 arch = "x86-64" |
| 229 } else if (translate_cpu == "arm") { | 229 } else if (translate_cpu == "arm") { |
| 230 arch = "armv7" | 230 arch = "armv7" |
| 231 } else if (translate_cpu == "mipsel") { |
| 232 arch = "mipsel" |
| 231 } | 233 } |
| 232 } | 234 } |
| 233 | 235 |
| 234 # The pre-translated object file has to be linked with an IRT shim to | 236 # The pre-translated object file has to be linked with an IRT shim to |
| 235 # get a runnable nexe. This is handled by pnacl-translate, which passes | 237 # get a runnable nexe. This is handled by pnacl-translate, which passes |
| 236 # -l:libpnacl_irt_shim.a to native linker, and we need to ensure the | 238 # -l:libpnacl_irt_shim.a to native linker, and we need to ensure the |
| 237 # linker can find the correct library. | 239 # linker can find the correct library. |
| 238 if (is_nacl_nonsfi) { | 240 if (is_nacl_nonsfi) { |
| 239 pnacl_irt_shim = "//ppapi/native_client/src/untrusted/pnacl_irt_shim:a
ot(//build/toolchain/nacl:newlib_pnacl_nonsfi)" | 241 pnacl_irt_shim = "//ppapi/native_client/src/untrusted/pnacl_irt_shim:a
ot(//build/toolchain/nacl:newlib_pnacl_nonsfi)" |
| 240 } else { | 242 } else { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 } | 390 } |
| 389 } | 391 } |
| 390 if (generate_nmf) { | 392 if (generate_nmf) { |
| 391 data_deps += [ ":$nmf_target_name" ] | 393 data_deps += [ ":$nmf_target_name" ] |
| 392 } | 394 } |
| 393 if (defined(invoker.test_files)) { | 395 if (defined(invoker.test_files)) { |
| 394 data_deps += [ ":$test_files_target_name" ] | 396 data_deps += [ ":$test_files_target_name" ] |
| 395 } | 397 } |
| 396 } | 398 } |
| 397 } | 399 } |
| OLD | NEW |