diff options
| author | sbc <sbc@chromium.org> | 2015-10-15 18:42:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-16 01:43:27 +0000 |
| commit | 5aa1f76df0bdf6350d1987c43b669140e317dd37 (patch) | |
| tree | dec660772786fedb6b83d32ae7e5bd7ea84c740b /native_client_sdk | |
| parent | 9c22c58e1dc6188fe07305846f9332e648a096a2 (diff) | |
| download | chromium_src-5aa1f76df0bdf6350d1987c43b669140e317dd37.zip chromium_src-5aa1f76df0bdf6350d1987c43b669140e317dd37.tar.gz chromium_src-5aa1f76df0bdf6350d1987c43b669140e317dd37.tar.bz2 | |
[NaCl SDK] Ship arm_elf_loader.nexe on all platforms
Enable sel_ldr testing glibc/arm builds.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk
BUG=505885
Review URL: https://codereview.chromium.org/1403303002
Cr-Commit-Position: refs/heads/master@{#354424}
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 14 | ||||
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 2 | ||||
| -rwxr-xr-x | native_client_sdk/src/build_tools/test_sdk.py | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index e99216a..04a3160 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -395,6 +395,9 @@ def GypNinjaInstall(pepperdir, toolchains): ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'], ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'], ] + arm_files = [ + ['elf_loader_newlib_arm.nexe', 'elf_loader_arm.nexe'], + ] tools_files_64 = [] @@ -429,19 +432,18 @@ def GypNinjaInstall(pepperdir, toolchains): pair[0] += '.exe' pair[1] += '.exe' - InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_64) - InstallFiles(GetNinjaOutDir('ia32'), tools_dir, tools_files_32) - # Add ARM binaries if platform == 'linux' and not options.no_arm_trusted: - arm_files = [ + arm_files += [ ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'], - ['elf_loader_newlib_arm.nexe', 'elf_loader_arm.nexe'], ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'], ['nonsfi_loader_newlib_arm_nonsfi.nexe', 'nonsfi_loader_arm'], ['sel_ldr', 'sel_ldr_arm'] ] - InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files) + + InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_64) + InstallFiles(GetNinjaOutDir('ia32'), tools_dir, tools_files_32) + InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files) for tc in toolchains: if tc in ('host', 'clang-newlib'): diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 4ed3cdf..a502a2f2 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -455,7 +455,7 @@ tools/create_html.py tools/create_nmf.py tools/decode_dump.py [linux,mac]tools/dump_syms -[linux]tools/elf_loader_arm.nexe +tools/elf_loader_arm.nexe tools/fix_deps.py tools/fix_manifest.py tools/genhttpfs.py diff --git a/native_client_sdk/src/build_tools/test_sdk.py b/native_client_sdk/src/build_tools/test_sdk.py index 355df28..b1cee6a 100755 --- a/native_client_sdk/src/build_tools/test_sdk.py +++ b/native_client_sdk/src/build_tools/test_sdk.py @@ -128,9 +128,6 @@ def StepRunSelLdrTests(pepperdir, sanitizer): for toolchain in ('clang-newlib', 'glibc', 'pnacl'): for arch in archs: - # TODO(sbc): Remove this once we get elf_loader.nexe added to the SDK - if toolchain == 'glibc' and arch == 'arm': - continue for config in configs: RunTest(location, toolchain, config, arch) |