diff options
| author | mcgrathr <mcgrathr@chromium.org> | 2016-02-27 01:18:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-27 09:20:53 +0000 |
| commit | fd4c78bf5566ffed5a2e2ae02549ba0421836086 (patch) | |
| tree | 71acbef62fc5eef13598b661047460ffb22cb4eb /ppapi | |
| parent | ac2a059d4486172d24bdcf5b82be6f5300d5102d (diff) | |
| download | chromium_src-fd4c78bf5566ffed5a2e2ae02549ba0421836086.zip chromium_src-fd4c78bf5566ffed5a2e2ae02549ba0421836086.tar.gz chromium_src-fd4c78bf5566ffed5a2e2ae02549ba0421836086.tar.bz2 | |
GN: Fix pnacl_support_extension on Windows x86 so it includes both architectures' shim libraries
The pnacl_component_crx_gen.py script needs two --lib_override flags
to cover both x86 and x64 at the same time.
BUG=584446
R=bradnelson@chromium.org
Review URL: https://codereview.chromium.org/1743853002
Cr-Commit-Position: refs/heads/master@{#378132}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn index d9162cf..f81896e 100644 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn @@ -66,6 +66,18 @@ if (enable_nacl) { outputs += [ output_prefix + output_cpu + "_" + output_elem ] } + shim_lib_path = + rebase_path(get_label_info(shim_target_tc_label, "target_out_dir") + + "/$src_shim_name", + root_build_dir) + + # This describes the irt shim library for the main architecture. + # On Windows x86, another switch will be added to this below. + lib_overrides = [ + "--lib_override", + "$shim_cpu,$shim_lib_path,$desired_shim_name", + ] + if (is_win && target_cpu == "x86") { # On Windows, for offline testing (i.e., without component updater # selecting the platform-specific files with multi-CRXes), we need @@ -73,33 +85,37 @@ if (enable_nacl) { # windows will need 64-bit nexes). shim_target_tc_label = "$shim_target_label(${shim_toolchain_base}x64)" - deps += [ shim_target_tc_label ] - shim_cpu = "x64" + shim_lib_path = + rebase_path(get_label_info(shim_target_tc_label, "target_out_dir") + + "/$src_shim_name", + root_build_dir) + + # Pass a second --lib_override for the second architecture. + lib_overrides += [ + "--lib_override", + "$shim_cpu,$shim_lib_path,$desired_shim_name", + ] + + deps += [ shim_target_tc_label ] + foreach(output_elem, outputs_from_toolchain) { outputs += [ output_prefix + "x86_64_" + output_elem ] } } - shim_lib_path = - rebase_path(get_label_info(shim_target_tc_label, "target_out_dir") + - "/$src_shim_name", - root_build_dir) - if (current_os == "chromeos") { toolchain_os = "linux" } else { toolchain_os = current_os } - args = [ + args = lib_overrides + args += [ "--dest", rebase_path("$root_out_dir/pnacl", root_build_dir), - "--lib_override", - "$shim_cpu,$shim_lib_path,$desired_shim_name", - "--target_arch", target_cpu, |