diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 20:55:28 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 20:55:28 +0000 |
| commit | cba08ff299b12769fb385b858a46301965b8a298 (patch) | |
| tree | 9dae4948ecbdd6caccb5fb87971ab942aa02da05 /native_client_sdk | |
| parent | 32543677827d32faca6c913f5ca17dc34ae9efad (diff) | |
| download | chromium_src-cba08ff299b12769fb385b858a46301965b8a298.zip chromium_src-cba08ff299b12769fb385b858a46301965b8a298.tar.gz chromium_src-cba08ff299b12769fb385b858a46301965b8a298.tar.bz2 | |
[NaCl SDK] Include Ragel ncval in SDK for all validation.
BUG=226406
R=noelallen@chromium.org
Review URL: https://codereview.chromium.org/16140015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 12 | ||||
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 8 |
2 files changed, 5 insertions, 15 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index c5c0453..d856b04 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -445,8 +445,7 @@ def GypNinjaInstall(pepperdir, platform, toolchains): ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release') tools_files = [ ['sel_ldr', 'sel_ldr_x86_32'], - ['ncval_x86_32', 'ncval_x86_32'], - ['ncval_arm', 'ncval_arm'], + ['ncval_new', 'ncval'], ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'], ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'], ] @@ -459,7 +458,6 @@ def GypNinjaInstall(pepperdir, platform, toolchains): if platform != 'mac': # Mac doesn't build 64-bit binaries. tools_files.append(['sel_ldr64', 'sel_ldr_x86_64']) - tools_files.append(['ncval_x86_64', 'ncval_x86_64']) if platform == 'linux': tools_files.append(['nacl_helper_bootstrap', @@ -513,22 +511,18 @@ def GypNinjaBuild_NaCl(platform, rel_out_dir): out_dir_arm = MakeNinjaRelPath(rel_out_dir + '-arm') GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir) GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm) - GypNinjaBuild('ia32', gyp_py, all_gyp, 'ncval_x86_32', out_dir) - GypNinjaBuild(None, gyp_py, all_gyp, 'ncval_arm', out_dir) + GypNinjaBuild('ia32', gyp_py, all_gyp, 'ncval_new', out_dir) if platform == 'win': NinjaBuild('sel_ldr64', out_dir) - NinjaBuild('ncval_x86_64', out_dir) elif platform == 'linux': out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-64') GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'sel_ldr', out_dir_64) - GypNinjaBuild('x64', gyp_py, all_gyp, 'ncval_x86_64', out_dir_64) - # We only need sel_ldr and ncval_x86_64 from the 64-bit out directory. + # We only need sel_ldr from the 64-bit out directory. # sel_ldr needs to be renamed, so we'll call it sel_ldr64. files_to_copy = [ ('sel_ldr', 'sel_ldr64'), - ('ncval_x86_64', 'ncval_x86_64'), ('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'), ] diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 09ed747..f1b01c3 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -978,12 +978,8 @@ tools/nacl_gcc.mk [linux]tools/nacl_helper_bootstrap_x86_32 [linux]tools/nacl_helper_bootstrap_x86_64 tools/nacl_llvm.mk -[linux,mac]tools/ncval_arm -[win]tools/ncval_arm.exe -[linux,mac]tools/ncval_x86_32 -[linux]tools/ncval_x86_64 -[win]tools/ncval_x86_32.exe -[win]tools/ncval_x86_64.exe +[linux,mac]tools/ncval +[win]tools/ncval.exe tools/oshelpers.py tools/oshelpers.pyc tools/quote.py |