summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_sources.gypi
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_sources.gypi
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_sources.gypi')
-rw-r--r--ppapi/ppapi_sources.gypi10
1 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index 8cdbcba..c419c80 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -313,9 +313,6 @@
#
'test_common_source_files': [
# Common test files
- 'lib/gl/gles2/gles2.c',
- 'lib/gl/gles2/gl2ext_ppapi.c',
- 'lib/gl/gles2/gl2ext_ppapi.h',
'tests/all_c_includes.h',
'tests/all_cpp_includes.h',
'tests/arch_dependent_sizes_32.h',
@@ -341,8 +338,6 @@
'tests/test_file_system.h',
'tests/test_graphics_2d.cc',
'tests/test_graphics_2d.h',
- 'tests/test_graphics_3d.cc',
- 'tests/test_graphics_3d.h',
'tests/test_host_resolver_private.cc',
'tests/test_host_resolver_private.h',
'tests/test_image_data.cc',
@@ -402,6 +397,9 @@
#
'test_trusted_source_files': [
# Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
+ 'lib/gl/gles2/gles2.c',
+ 'lib/gl/gles2/gl2ext_ppapi.c',
+ 'lib/gl/gles2/gl2ext_ppapi.h',
'tests/test_broker.cc',
'tests/test_broker.h',
'tests/test_browser_font.cc',
@@ -428,6 +426,8 @@
'tests/test_flash_message_loop.h',
'tests/test_fullscreen.cc',
'tests/test_fullscreen.h',
+ 'tests/test_graphics_3d.cc',
+ 'tests/test_graphics_3d.h',
'tests/test_net_address_private.cc',
'tests/test_net_address_private.h',
'tests/test_network_monitor_private.cc',