diff options
| author | sbc <sbc@chromium.org> | 2015-07-16 11:19:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-16 18:20:09 +0000 |
| commit | a4f578ebe403ea3b443fc84632f3ec2b0b966f27 (patch) | |
| tree | 73bac4fc86c5f721650e793257f5347b852bc988 /native_client_sdk/src | |
| parent | f04d00c8834f74e9d065c405d2f946c38c0b288a (diff) | |
| download | chromium_src-a4f578ebe403ea3b443fc84632f3ec2b0b966f27.zip chromium_src-a4f578ebe403ea3b443fc84632f3ec2b0b966f27.tar.gz chromium_src-a4f578ebe403ea3b443fc84632f3ec2b0b966f27.tar.bz2 | |
[NaCl SDK] Build jsconcpp library for all toolchains
One of our users noticed that it was not built for with the
new clang-newlib toolchain. This change removes the
restriction so it will now be built with all toolchains.
Also, build liberror_handling for clang-newlib.
Review URL: https://codereview.chromium.org/1238033002
Cr-Commit-Position: refs/heads/master@{#339077}
Diffstat (limited to 'native_client_sdk/src')
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 12 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/error_handling/library.dsc | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/jsoncpp/library.dsc | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index c117f79..e43a699 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -135,8 +135,10 @@ include/win/sys/poll.h [win]lib/${PLATFORM}_x86_32_host/Release/ppapi_gles2.lib [win]lib/${PLATFORM}_x86_32_host/Release/pthread.lib [win]lib/${PLATFORM}_x86_32_host/Release/sdk_util.lib +lib/clang-newlib_arm/Debug/liberror_handling.a lib/clang-newlib_arm/Debug/libgmock.a lib/clang-newlib_arm/Debug/libgtest.a +lib/clang-newlib_arm/Debug/libjsoncpp.a lib/clang-newlib_arm/Debug/libnacl_io.a lib/clang-newlib_arm/Debug/libppapi_cpp.a lib/clang-newlib_arm/Debug/libppapi_cpp_private.a @@ -144,8 +146,10 @@ lib/clang-newlib_arm/Debug/libppapi_gles2.a lib/clang-newlib_arm/Debug/libppapi_simple.a lib/clang-newlib_arm/Debug/libppapi_simple_cpp.a lib/clang-newlib_arm/Debug/libsdk_util.a +lib/clang-newlib_arm/Release/liberror_handling.a lib/clang-newlib_arm/Release/libgmock.a lib/clang-newlib_arm/Release/libgtest.a +lib/clang-newlib_arm/Release/libjsoncpp.a lib/clang-newlib_arm/Release/libnacl_io.a lib/clang-newlib_arm/Release/libppapi_cpp.a lib/clang-newlib_arm/Release/libppapi_cpp_private.a @@ -153,8 +157,10 @@ lib/clang-newlib_arm/Release/libppapi_gles2.a lib/clang-newlib_arm/Release/libppapi_simple.a lib/clang-newlib_arm/Release/libppapi_simple_cpp.a lib/clang-newlib_arm/Release/libsdk_util.a +lib/clang-newlib_x86_32/Debug/liberror_handling.a lib/clang-newlib_x86_32/Debug/libgmock.a lib/clang-newlib_x86_32/Debug/libgtest.a +lib/clang-newlib_x86_32/Debug/libjsoncpp.a lib/clang-newlib_x86_32/Debug/libnacl_io.a lib/clang-newlib_x86_32/Debug/libppapi_cpp.a lib/clang-newlib_x86_32/Debug/libppapi_cpp_private.a @@ -162,8 +168,10 @@ lib/clang-newlib_x86_32/Debug/libppapi_gles2.a lib/clang-newlib_x86_32/Debug/libppapi_simple.a lib/clang-newlib_x86_32/Debug/libppapi_simple_cpp.a lib/clang-newlib_x86_32/Debug/libsdk_util.a +lib/clang-newlib_x86_32/Release/liberror_handling.a lib/clang-newlib_x86_32/Release/libgmock.a lib/clang-newlib_x86_32/Release/libgtest.a +lib/clang-newlib_x86_32/Release/libjsoncpp.a lib/clang-newlib_x86_32/Release/libnacl_io.a lib/clang-newlib_x86_32/Release/libppapi_cpp.a lib/clang-newlib_x86_32/Release/libppapi_cpp_private.a @@ -171,8 +179,10 @@ lib/clang-newlib_x86_32/Release/libppapi_gles2.a lib/clang-newlib_x86_32/Release/libppapi_simple.a lib/clang-newlib_x86_32/Release/libppapi_simple_cpp.a lib/clang-newlib_x86_32/Release/libsdk_util.a +lib/clang-newlib_x86_64/Debug/liberror_handling.a lib/clang-newlib_x86_64/Debug/libgmock.a lib/clang-newlib_x86_64/Debug/libgtest.a +lib/clang-newlib_x86_64/Debug/libjsoncpp.a lib/clang-newlib_x86_64/Debug/libnacl_io.a lib/clang-newlib_x86_64/Debug/libppapi_cpp.a lib/clang-newlib_x86_64/Debug/libppapi_cpp_private.a @@ -180,8 +190,10 @@ lib/clang-newlib_x86_64/Debug/libppapi_gles2.a lib/clang-newlib_x86_64/Debug/libppapi_simple.a lib/clang-newlib_x86_64/Debug/libppapi_simple_cpp.a lib/clang-newlib_x86_64/Debug/libsdk_util.a +lib/clang-newlib_x86_64/Release/liberror_handling.a lib/clang-newlib_x86_64/Release/libgmock.a lib/clang-newlib_x86_64/Release/libgtest.a +lib/clang-newlib_x86_64/Release/libjsoncpp.a lib/clang-newlib_x86_64/Release/libnacl_io.a lib/clang-newlib_x86_64/Release/libppapi_cpp.a lib/clang-newlib_x86_64/Release/libppapi_cpp_private.a diff --git a/native_client_sdk/src/libraries/error_handling/library.dsc b/native_client_sdk/src/libraries/error_handling/library.dsc index f8ff7b6..cad492f 100644 --- a/native_client_sdk/src/libraries/error_handling/library.dsc +++ b/native_client_sdk/src/libraries/error_handling/library.dsc @@ -1,5 +1,5 @@ { - 'TOOLS': ['newlib'], + 'TOOLS': ['newlib', 'clang-newlib'], 'TARGETS': [ { 'NAME' : 'error_handling', diff --git a/native_client_sdk/src/libraries/jsoncpp/library.dsc b/native_client_sdk/src/libraries/jsoncpp/library.dsc index 22551ff..bf9ec2d 100644 --- a/native_client_sdk/src/libraries/jsoncpp/library.dsc +++ b/native_client_sdk/src/libraries/jsoncpp/library.dsc @@ -1,5 +1,4 @@ { - 'TOOLS': ['bionic', 'newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'], 'SEARCH': [ '.', '../../../../third_party/jsoncpp/source/include/json', |