summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_untrusted.gyp
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 00:44:55 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 00:44:55 +0000
commit0b0a4c7f641c921555a31c9f4d4a620f7ba238e0 (patch)
tree93c86f0c4892ea62024749698b57ee1704015b61 /ppapi/ppapi_untrusted.gyp
parent6dba1dd2efa3ed67bd41312bc682fc12c3c69544 (diff)
downloadchromium_src-0b0a4c7f641c921555a31c9f4d4a620f7ba238e0.zip
chromium_src-0b0a4c7f641c921555a31c9f4d4a620f7ba238e0.tar.gz
chromium_src-0b0a4c7f641c921555a31c9f4d4a620f7ba238e0.tar.bz2
Revert 144030 - Add test_graphics3d to ppapi_uitest, untrusted (NaCl) test suite, using
OSMesa as needed for bots. Add AudioConfig tests to ppapi_uitest untrusted (NaCl) suite. Tweak gyp for untrusted NaCl build so apps using TLS links without errors. BUG=none TEST=this is the test Review URL: https://chromiumcodereview.appspot.com/10591004 TBR=nfullagar@google.com Review URL: https://chromiumcodereview.appspot.com/10659023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_untrusted.gyp')
-rw-r--r--ppapi/ppapi_untrusted.gyp10
1 files changed, 0 insertions, 10 deletions
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index 8c4b2fa..6dd88ac 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -38,13 +38,6 @@
'native_client/native_client.gyp:nacl_irt',
],
'variables': {
- 'defines': [
- '<@(default_defines)',
- '-DGL_GLEXT_PROTOTYPES',
- ],
- 'compile_flags': [
- '-mno-tls-use-call',
- ],
'nexe_target': 'ppapi_nacl_tests',
'build_newlib': 1,
'include_dirs': [
@@ -54,9 +47,6 @@
'link_flags': [
'-lppapi_cpp',
'-lppapi',
- '-lplatform',
- '-lpthread',
- '-lgio',
],
# TODO(bradchen): get rid of extra_deps64 and extra_deps32
# once native_client/build/untrusted.gypi no longer needs them.