diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 01:10:06 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 01:10:06 +0000 |
| commit | 4223f8d3d82ed7794ffce1ac174a91e62e8795ad (patch) | |
| tree | 693f6ba81abd84e63022399f5f381af5e1d6d984 /ppapi/native_client | |
| parent | e3be19f14017488bd5285aa9415e0ec27eecdb9f (diff) | |
| download | chromium_src-4223f8d3d82ed7794ffce1ac174a91e62e8795ad.zip chromium_src-4223f8d3d82ed7794ffce1ac174a91e62e8795ad.tar.gz chromium_src-4223f8d3d82ed7794ffce1ac174a91e62e8795ad.tar.bz2 | |
Enable PPAPINaCl GLIBC browser_tests.
NOTE: NaCl CL to update untrusted.gypi must go in first.
BUG=127699
TEST=this is a test
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=140786
Review URL: https://chromiumcodereview.appspot.com/10409032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 18 | ||||
| -rw-r--r-- | ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf | 7 |
2 files changed, 24 insertions, 1 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index df3007e3..c34d6b5 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,6 +16,8 @@ '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib', '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib', ], + # Here we copy linker scripts out of the Native Client repository. + # These are source, not build artifacts. 'copies': [ { 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32', @@ -30,6 +32,20 @@ ], }, { + 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32', + 'files': [ + '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', + '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so', + ], + }, + { + 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64', + 'files': [ + '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', + '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so', + ], + }, + { 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm', 'files': [ '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a', diff --git a/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf b/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf new file mode 100644 index 0000000..f0bb249 --- /dev/null +++ b/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf @@ -0,0 +1,7 @@ +{ + "program": { + "x86-64": {"url": "ppapi_nacl_tests_newlib_x64.nexe"}, + "x86-32": {"url": "ppapi_nacl_tests_newlib_x32.nexe"}, + "arm": {"url": "ppapi_nacl_tests_newlib_arm.nexe"} + } +} |