From dc440cac1b3bd07a03272678a2be4c931d7d1957 Mon Sep 17 00:00:00 2001
From: "cbentzel@chromium.org"
 <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 6 Jun 2012 18:13:24 +0000
Subject: Revert 140786 - Enable PPAPINaCl GLIBC browser_tests.

NOTE: NaCl CL to update untrusted.gypi must go in first.

BUG=127699
TEST=this is a test


Review URL: https://chromiumcodereview.appspot.com/10409032

TBR=bradchen@google.com
Review URL: https://chromiumcodereview.appspot.com/10543028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140790 0039d316-1c4b-4281-b951-d872f2087c98
---
 ppapi/native_client/native_client.gyp                  | 18 +-----------------
 .../tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf      |  7 -------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf

(limited to 'ppapi/native_client')

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"}
-  }
-}
-- 
cgit v1.1