summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorhamaji <hamaji@chromium.org>2015-01-21 17:34:42 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-22 01:35:24 +0000
commit86e2da7a24b9db13741e8a605eaf4367dad3b81d (patch)
treebbbebf7357532be7ada6b58c75d8a297f7276438 /native_client_sdk
parent2189837d9abff9e19a206755791e1c5e7ef602ae (diff)
downloadchromium_src-86e2da7a24b9db13741e8a605eaf4367dad3b81d.zip
chromium_src-86e2da7a24b9db13741e8a605eaf4367dad3b81d.tar.gz
chromium_src-86e2da7a24b9db13741e8a605eaf4367dad3b81d.tar.bz2
Release nonsfi_loader_arm as a part of NaCl SDK
TEST=./build_tools/build_sdk.py --tar TEST=trybot BUG= https://code.google.com/p/nativeclient/issues/detail?id=3851 Review URL: https://codereview.chromium.org/832323003 Cr-Commit-Position: refs/heads/master@{#312516}
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/build_artifacts.py2
-rwxr-xr-xnative_client_sdk/src/build_tools/build_sdk.py5
-rw-r--r--native_client_sdk/src/build_tools/sdk_files.list1
3 files changed, 6 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/build_artifacts.py b/native_client_sdk/src/build_tools/build_artifacts.py
index 1a9f0d8..d412230 100755
--- a/native_client_sdk/src/build_tools/build_artifacts.py
+++ b/native_client_sdk/src/build_tools/build_artifacts.py
@@ -243,6 +243,8 @@ def GetToolsFiles():
files.append(['nacl_helper_bootstrap', 'nacl_helper_bootstrap_x86_32'])
files.append(['nonsfi_loader_newlib_x32_nonsfi.nexe',
'nonsfi_loader_x86_32'])
+ files.append(['nonsfi_loader_newlib_arm_nonsfi.nexe',
+ 'nonsfi_loader_arm'])
# Add .exe extensions to all windows tools
for pair in files:
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index cd34081..bee0f3a 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -418,8 +418,9 @@ def GypNinjaInstall(pepperdir, toolchains):
tools_files = [
['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
- ['sel_ldr', 'sel_ldr_arm'],
- ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm']
+ ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'],
+ ['nonsfi_loader_newlib_arm_nonsfi.nexe', 'nonsfi_loader_arm'],
+ ['sel_ldr', 'sel_ldr_arm']
]
ninja_out_dir = os.path.join(OUT_DIR, build_dir + '-arm', 'Release')
InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files)
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index 999cad0..9c5c75f 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -441,6 +441,7 @@ tools/nacl_gcc.mk
tools/nacl_llvm.mk
tools/ncval${EXE_EXT}
tools/ncval.py
+[linux]tools/nonsfi_loader_arm${EXE_EXT}
[linux]tools/nonsfi_loader_x86_32${EXE_EXT}
tools/oshelpers.py
tools/run.py