| Index: native_client_sdk/src/build_tools/extract_artifacts.py
|
| diff --git a/native_client_sdk/src/build_tools/extract_artifacts.py b/native_client_sdk/src/build_tools/extract_artifacts.py
|
| index f1748b487f5ec176339d30a8c538139d33edf3fb..9534976aad55152c2d5b527699d0392e3b8e0c47 100755
|
| --- a/native_client_sdk/src/build_tools/extract_artifacts.py
|
| +++ b/native_client_sdk/src/build_tools/extract_artifacts.py
|
| @@ -26,12 +26,9 @@ import oshelpers
|
| DOWNLOAD_ARCHIVE_DIR = build_paths.BUILD_ARCHIVE_DIR
|
|
|
| PLATFORM = getos.GetPlatform()
|
| -NEWLIB_X86_TC_DIR = os.path.join('toolchain', '%s_x86_newlib' % PLATFORM)
|
| -NEWLIB_ARM_TC_DIR = os.path.join('toolchain', '%s_arm_newlib' % PLATFORM)
|
| GLIBC_X86_TC_DIR = os.path.join('toolchain', '%s_x86_glibc' % PLATFORM)
|
| PNACL_TC_DIR = os.path.join('toolchain', '%s_pnacl' % PLATFORM)
|
| PNACL_TRANSLATOR_DIR = os.path.join(PNACL_TC_DIR, 'translator')
|
| -BIONIC_TC_DIR = os.path.join('toolchain', '%s_arm_bionic' % PLATFORM)
|
|
|
| CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
|
| TAR = oshelpers.FindExeInPath('tar')
|
| @@ -42,18 +39,6 @@ options = None
|
| PPAPI_ARCHIVE = os.path.join(DOWNLOAD_ARCHIVE_DIR,
|
| '%s_ppapi.tar.bz2' % PLATFORM)
|
|
|
| -
|
| -NEWLIB_ARCHIVE_MAP = [
|
| - ('newlib', NEWLIB_X86_TC_DIR),
|
| - ('arm', NEWLIB_ARM_TC_DIR),
|
| - ('newlib_headers', [
|
| - os.path.join(NEWLIB_X86_TC_DIR, 'x86_64-nacl', 'include'),
|
| - os.path.join(NEWLIB_ARM_TC_DIR, 'arm-nacl', 'include')]),
|
| - ('newlib_arm_libs', os.path.join(NEWLIB_ARM_TC_DIR, 'arm-nacl', 'lib')),
|
| - ('newlib_x86_32_libs',
|
| - os.path.join(NEWLIB_X86_TC_DIR, 'x86_64-nacl', 'lib32')),
|
| - ('newlib_x86_64_libs', os.path.join(NEWLIB_X86_TC_DIR, 'x86_64-nacl', 'lib'))]
|
| -
|
| GLIBC_ARCHIVE_MAP = [
|
| ('glibc', GLIBC_X86_TC_DIR),
|
| ('glibc_headers', os.path.join(GLIBC_X86_TC_DIR, 'x86_64-nacl', 'include')),
|
| @@ -71,17 +56,9 @@ PNACL_ARCHIVE_MAP = [
|
| ('pnacl_translator_x86_64_libs',
|
| os.path.join(PNACL_TRANSLATOR_DIR, 'x86-64', 'lib'))]
|
|
|
| -BIONIC_ARCHIVE_MAP = [
|
| - ('bionic', BIONIC_TC_DIR),
|
| - ('bionic_headers', os.path.join(BIONIC_TC_DIR, 'arm-nacl', 'include')),
|
| - ('bionic_arm_libs', os.path.join(BIONIC_TC_DIR, 'arm-nacl', 'lib'))]
|
| -
|
| -
|
| TOOLCHAIN_ARCHIVE_MAPS = {
|
| - 'newlib': NEWLIB_ARCHIVE_MAP,
|
| 'glibc': GLIBC_ARCHIVE_MAP,
|
| 'pnacl': PNACL_ARCHIVE_MAP,
|
| - 'bionic': BIONIC_ARCHIVE_MAP,
|
| }
|
|
|
| TOOLS_ARCHIVE_MAP = [('tools', 'tools')]
|
|
|