Revert of [NaCl SDK] Don't overwrite components that already ship in the NaCl toolchain (patchset #2 id:20001 of https://codereview.chromium.org/1052563005/)

Reason for revert:
This caused a regression in naclports because the libnacl we ship in the x86-newlib toolchain is quite old and overriding it was hiding this issue.

Original issue's description:
> [NaCl SDK] Don't overwrite components that already ship in the NaCl toolchain
>
> We are currently redundantly building and copying serveral
> libraries and headers that already ship in the NaCl toolchain
> tarballs.  This change removes the copying.  Once this lands
> we can reduce the redundant building by removing targets
> from the nacl_core_sdk gyp target.
>
> The dynamic_annotations.h header was removed from ARM
> and le32-nacl targets since it has no support for ARM or
> bitcode (i.e. we should never have been shipping the
> header for those toolchains).

TBR=binji@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1060563004

Cr-Commit-Position: refs/heads/master@{#323778}

2 files changed, 140 insertions, 5 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index fceb77b..c0a630f 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -260,11 +260,23 @@ NACL_HEADER_MAP = {
   'newlib': [
       ('native_client/src/include/nacl/nacl_exception.h', 'nacl/'),
       ('native_client/src/include/nacl/nacl_minidump.h', 'nacl/'),
+      ('native_client/src/untrusted/irt/irt.h', ''),
+      ('native_client/src/untrusted/irt/irt_dev.h', ''),
+      ('native_client/src/untrusted/nacl/nacl_dyncode.h', 'nacl/'),
+      ('native_client/src/untrusted/nacl/nacl_startup.h', 'nacl/'),
+      ('native_client/src/untrusted/pthread/pthread.h', ''),
+      ('native_client/src/untrusted/pthread/semaphore.h', ''),
+      ('native_client/src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
       ('ppapi/nacl_irt/public/irt_ppapi.h', ''),
   ],
   'glibc': [
       ('native_client/src/include/nacl/nacl_exception.h', 'nacl/'),
       ('native_client/src/include/nacl/nacl_minidump.h', 'nacl/'),
+      ('native_client/src/untrusted/irt/irt.h', ''),
+      ('native_client/src/untrusted/irt/irt_dev.h', ''),
+      ('native_client/src/untrusted/nacl/nacl_dyncode.h', 'nacl/'),
+      ('native_client/src/untrusted/nacl/nacl_startup.h', 'nacl/'),
+      ('native_client/src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
       ('ppapi/nacl_irt/public/irt_ppapi.h', ''),
   ],
   'bionic': [
@@ -330,22 +342,51 @@ def MakeNinjaRelPath(path):
   return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
 
 
+# TODO(ncbray): stop building and copying libraries into the SDK that are
+# already provided by the toolchain.
 TOOLCHAIN_LIBS = {
   'bionic' : [
+    'libminidump_generator.a',
+    'libnacl_dyncode.a',
+    'libnacl_exception.a',
+    'libnacl_list_mappings.a',
     'libppapi.a',
   ],
   'newlib' : [
+    'libminidump_generator.a',
+    'libnacl.a',
+    'libnacl_dyncode.a',
+    'libnacl_exception.a',
+    'libnacl_list_mappings.a',
+    'libnosys.a',
     'libppapi.a',
     'libppapi_stub.a',
+    'libpthread.a',
   ],
   'glibc': [
+    'libminidump_generator.a',
+    'libminidump_generator.so',
+    'libnacl.a',
+    'libnacl_dyncode.a',
+    'libnacl_dyncode.so',
+    'libnacl_exception.a',
+    'libnacl_exception.so',
+    'libnacl_list_mappings.a',
+    'libnacl_list_mappings.so',
     'libppapi.a',
     'libppapi.so',
     'libppapi_stub.a',
   ],
   'pnacl': [
+    'libminidump_generator.a',
+    'libnacl.a',
+    'libnacl_dyncode.a',
+    'libnacl_exception.a',
+    'libnacl_list_mappings.a',
+    'libnosys.a',
     'libppapi.a',
     'libppapi_stub.a',
+    'libpthread.a',
   ]
 }
 
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index c319f01..e4f829f 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -377,47 +377,141 @@ src/ppapi_simple_cpp/*
 [win]src/pthread/README
 src/sdk_util/*
 toolchain/${PLATFORM}_arm_newlib/*
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt_dev.h
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_dyncode.h
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_exception.h
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/pthread.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/include/semaphore.h
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/crti.o
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/crtn.o
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_arm_newlib/arm-nacl/lib/libpthread.a
 toolchain/${PLATFORM}_pnacl/*
-toolchain/${PLATFORM}_pnacl/arm-nacl/include/irt_ppapi.h
-toolchain/${PLATFORM}_pnacl/arm-nacl/include/nacl/nacl_exception.h
-toolchain/${PLATFORM}_pnacl/arm-nacl/include/nacl/nacl_minidump.h
-toolchain/${PLATFORM}_pnacl/arm-nacl/lib/libppapi.a
-toolchain/${PLATFORM}_pnacl/arm-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/irt.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/irt_dev.h
 toolchain/${PLATFORM}_pnacl/le32-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/nacl/nacl_dyncode.h
 toolchain/${PLATFORM}_pnacl/le32-nacl/include/nacl/nacl_exception.h
 toolchain/${PLATFORM}_pnacl/le32-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/pthread.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/include/semaphore.h
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_pnacl/le32-nacl/lib/libpthread.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/irt.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/irt_dev.h
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/nacl/nacl_dyncode.h
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/nacl/nacl_exception.h
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/pthread.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/include/semaphore.h
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib/libpthread.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libnosys.a
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libppapi.a
 toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_pnacl/x86_64-nacl/lib32/libpthread.a
 toolchain/${PLATFORM}_x86_glibc/*
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt_dev.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_dyncode.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_exception.h
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libminidump_generator.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_dyncode.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_exception.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libnacl_list_mappings.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libminidump_generator.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_dyncode.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_exception.so
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libnacl_list_mappings.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.a
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi.so
 toolchain/${PLATFORM}_x86_glibc/x86_64-nacl/lib32/libppapi_stub.a
 toolchain/${PLATFORM}_x86_newlib/*
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt_dev.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/irt_ppapi.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/dynamic_annotations.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_dyncode.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_exception.h
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_minidump.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/nacl/nacl_startup.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/pthread.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/include/semaphore.h
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crti.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/crtn.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libminidump_generator.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_exception.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libnosys.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib/libpthread.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crti.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/crtn.o
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libminidump_generator.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_dyncode.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_exception.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnacl_list_mappings.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnosys.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi.a
 toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi_stub.a
+toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libpthread.a
 tools/cl_wrapper.py
 tools/common.mk
 tools/compiler-wrapper.py