diff options
Diffstat (limited to 'ppapi')
| -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 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 36 | ||||
| -rw-r--r-- | ppapi/tests/test_case.html | 9 |
4 files changed, 10 insertions, 60 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index c34d6b5..df3007e3 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 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,8 +16,6 @@ '../../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', @@ -32,20 +30,6 @@ ], }, { - '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 deleted file mode 100644 index f0bb249..0000000 --- a/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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"} - } -} diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp index 1817dca..57fe4a1 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/ppapi/ppapi_untrusted.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 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. @@ -17,7 +17,7 @@ 'type': 'none', 'variables': { 'nlib_target': 'libppapi_cpp.a', - 'build_glibc': 1, + 'build_glibc': 0, 'build_newlib': 1, 'sources': [ '<@(cpp_source_files)', @@ -39,14 +39,8 @@ ], 'variables': { 'nexe_target': 'ppapi_nacl_tests', - 'build_glibc': 1, + 'build_glibc': 0, 'build_newlib': 1, - # NOTE: Use /lib, not /lib64 here; it is a symbolic link which - # doesn't work on Windows. - 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', - 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', - 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', - 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', 'include_dirs': [ 'lib/gl/include', '..', @@ -61,6 +55,10 @@ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a', ], + 'extra_deps32': [ + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a', + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a', + ], 'extra_deps_newlib64': [ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a', @@ -86,26 +84,6 @@ '<@(test_nacl_source_files)', ], }, - 'actions': [ - { - 'action_name': 'Generate GLIBC NMF and copy libs', - 'inputs': ['>(out_glibc64)', '>(out_glibc32)'], - # NOTE: There is no explicit dependency for the lib32 - # and lib64 directories created in the PRODUCT_DIR. - # They are created as a side-effect of NMF creation. - 'outputs': ['>(nmf_glibc)'], - 'action': [ - 'python', - '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', - '>@(_inputs)', - '--objdump=>(nacl_objdump)', - '--library-path=>(libdir_glibc64)', - '--library-path=>(libdir_glibc32)', - '--output=>(nmf_glibc)', - '--stage-dependencies=<(PRODUCT_DIR)', - ], - }, - ], }, ], } diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html index a9d0879..d395f13 100644 --- a/ppapi/tests/test_case.html +++ b/ppapi/tests/test_case.html @@ -197,14 +197,9 @@ onload = function() { var mode = ExtractSearchParameter("mode"); document.title = 'Test ' + testcase; var obj; - if (mode == "nacl_newlib") { + if (mode == "nacl") { obj = document.createElement("EMBED"); - obj.setAttribute("src", "ppapi_nacl_tests_newlib.nmf"); - obj.setAttribute("type", "application/x-nacl"); - obj.setAttribute("mode", mode); - } else if (mode == "nacl_glibc") { - obj = document.createElement("EMBED"); - obj.setAttribute("src", "ppapi_nacl_tests_glibc.nmf"); + obj.setAttribute("src", "test_case.nmf"); obj.setAttribute("type", "application/x-nacl"); obj.setAttribute("mode", mode); } else { |