| 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/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 # We could use 'copies', but we want to rename the files | 8 # We could use 'copies', but we want to rename the files |
| 9 # in a white-listed way first. Thus use an action. | 9 # in a white-listed way first. Thus use an action. |
| 10 action("pnacl_support_extension") { | 10 action("pnacl_support_extension") { |
| 11 script = "pnacl_component_crx_gen.py" | 11 script = "pnacl_component_crx_gen.py" |
| 12 inputs = [ | 12 inputs = [ |
| 13 "//native_client/build/package_version/package_version.py", | 13 "//native_client/build/package_version/package_version.py", |
| 14 "//native_client/pnacl/driver/pnacl_info_template.json", | 14 "//native_client/pnacl/driver/pnacl_info_template.json", |
| 15 "//native_client/toolchain_revisions/pnacl_translator.json", | 15 "//native_client/toolchain_revisions/pnacl_translator.json", |
| 16 ] | 16 ] |
| 17 shim_target_dir = "//ppapi/native_client/src/untrusted/pnacl_irt_shim/" | 17 shim_target_dir = "//ppapi/native_client/src/untrusted/pnacl_irt_shim/" |
| 18 shim_target_out_dir = | 18 shim_target_out_dir = |
| 19 rebase_path(get_path_info(shim_target_dir, "out_dir"), root_build_dir) | 19 rebase_path(get_path_info(shim_target_dir, "out_dir"), root_build_dir) |
| 20 src_shim_name = "libpnacl_irt_shim_browser.a" | 20 src_shim_name = "libpnacl_irt_shim_browser.a" |
| 21 desired_shim_name = "libpnacl_irt_shim.a" | 21 desired_shim_name = "libpnacl_irt_shim.a" |
| 22 shim_target_label = "$shim_target_dir:browser" | 22 shim_target_label = "$shim_target_dir:browser" |
| 23 | 23 |
| 24 # Use the IRT toolchain to build the shim. We want similar properties | 24 # Use the IRT toolchain to build the shim. We want similar properties |
| 25 # (x86-64 sandbox base address hiding). One thing we don't want is the | 25 # (x86-64 sandbox base address hiding). One thing we don't want is the |
| 26 # IRT's secondary TLS, but that is handled by tls_edit and not compiler | 26 # IRT's secondary TLS, but that is handled by tls_edit and not compiler |
| 27 # flags (so IRT compiler flags should be fine). | 27 # flags (so IRT compiler flags should be fine). |
| 28 shim_toolchain_base = "//native_client/build/toolchain/nacl:irt_" | 28 shim_toolchain_base = "//build/toolchain/nacl:irt_" |
| 29 |
| 29 shim_target_tc_label = "$shim_target_label($shim_toolchain_base$target_cpu)" | 30 shim_target_tc_label = "$shim_target_label($shim_toolchain_base$target_cpu)" |
| 30 deps = [ | 31 deps = [ |
| 31 shim_target_tc_label, | 32 shim_target_tc_label, |
| 32 ] | 33 ] |
| 33 | 34 |
| 34 # Figure out the path of the shim library that we depend upon. | 35 # Figure out the path of the shim library that we depend upon. |
| 35 # TODO(jvoung): change this to: | 36 # TODO(jvoung): change this to: |
| 36 # lib_path = rebase_path( | 37 # lib_path = rebase_path( |
| 37 # get_label_info(shim_target_tc_label, "target_out_dir"), | 38 # get_label_info(shim_target_tc_label, "target_out_dir"), |
| 38 # root_build_dir) | 39 # root_build_dir) |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 rebase_path("//native_client/build/package_version/package_version.py", | 134 rebase_path("//native_client/build/package_version/package_version.py", |
| 134 root_build_dir), | 135 root_build_dir), |
| 135 "--pnacl_package_name", | 136 "--pnacl_package_name", |
| 136 "pnacl_translator", | 137 "pnacl_translator", |
| 137 | 138 |
| 138 # ABI Version Number | 139 # ABI Version Number |
| 139 "1", | 140 "1", |
| 140 ] | 141 ] |
| 141 } | 142 } |
| 142 } | 143 } |
| OLD | NEW |