diff options
| author | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 23:53:00 +0000 |
|---|---|---|
| committer | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 23:53:00 +0000 |
| commit | 26d1df3fe85e61081713a6a5240f8d47055c85d2 (patch) | |
| tree | 4eac48eea0e6146fa9202328e0b543c8559fe1f1 /native_client_sdk | |
| parent | 51d4724ffd049b6b373f7bef74ed6e50781304ff (diff) | |
| download | chromium_src-26d1df3fe85e61081713a6a5240f8d47055c85d2.zip chromium_src-26d1df3fe85e61081713a6a5240f8d47055c85d2.tar.gz chromium_src-26d1df3fe85e61081713a6a5240f8d47055c85d2.tar.bz2 | |
Add missing pnacl libraries and headers and tools.
BUG=242561
R=binji@chromium.org
Review URL: https://codereview.chromium.org/16240005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 30 | ||||
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index dc34fc4..1e08959 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -444,6 +444,13 @@ def GypNinjaInstall(pepperdir, platform, toolchains): ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'], ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'], ] + if sys.platform not in ['cygwin', 'win32']: + minidump_files = [ + ['dump_syms', 'dump_syms'], + ['minidump_dump', 'minidump_dump'], + ['minidump_stackwalk', 'minidump_stackwalk'] + ] + tools_files.extend(minidump_files) # TODO(binji): dump_syms doesn't currently build on Windows. See # http://crbug.com/245456 @@ -536,7 +543,8 @@ def GypNinjaBuild_Breakpad(platform, rel_out_dir): gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium') out_dir = MakeNinjaRelPath(rel_out_dir) gyp_file = os.path.join(SRC_DIR, 'breakpad', 'breakpad.gyp') - GypNinjaBuild('ia32', gyp_py, gyp_file, 'dump_syms', out_dir) + build_list = ['dump_syms', 'minidump_dump', 'minidump_stackwalk'] + GypNinjaBuild('ia32', gyp_py, gyp_file, build_list, out_dir) def GypNinjaBuild_PPAPI(arch, rel_out_dir): @@ -559,6 +567,16 @@ def GypNinjaBuild_Pnacl(rel_out_dir, target_arch): targets = ['pnacl_irt_shim'] GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False) + gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl') + gyp_file = os.path.join(NACL_DIR, 'src', 'untrusted', 'minidump_generator', + 'minidump_generator.gyp') + targets = ['minidump_generator_lib'] + GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False) + + gyp_file = os.path.join(NACL_DIR, 'src', 'untrusted', 'nacl', 'nacl.gyp') + targets = ['nacl_exception_lib'] + GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False) + def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir, force_arm_gcc=True): @@ -648,6 +666,16 @@ def BuildStepBuildToolchains(pepperdir, platform, toolchains): os.path.join(release_build_dir, 'libpnacl_irt_shim.a'), GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch])) + release_build_dir = os.path.join(OUT_DIR, build_dir, 'Release', + 'gen', 'tc_pnacl_newlib', 'lib') + buildbot_common.CopyFile( + os.path.join(release_build_dir, 'libminidump_generator.a'), + GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch])) + + buildbot_common.CopyFile( + os.path.join(release_build_dir, 'libnacl_exception.a'), + GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch])) + InstallNaClHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'), 'newlib') diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index a39d9f7..61deb99 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -967,6 +967,8 @@ tools/compiler-wrapper.py tools/create_nmf.py tools/decode_dump.py [linux,mac]tools/dump_syms +[linux,mac]tools/minidump_stackwalk +[linux,mac]tools/minidump_dump tools/genhttpfs.py tools/getos.py tools/host_gcc.mk |