Revert 111618 - Reapply of http://codereview.chromium.org/8632023/

ppapi/ppapi_tests.gypi

Index: ppapi/ppapi_tests.gypi
===================================================================
--- ppapi/ppapi_tests.gypi	(revision 111620)
+++ ppapi/ppapi_tests.gypi	(working copy)
@@ -64,7 +64,89 @@
         'lib/gl/include',
       ],
       'sources': [
-        '<@(test_sources)', 
+        # Common test files.
+        'tests/test_case.cc',
+        'tests/test_case.h',
+        'tests/testing_instance.cc',
+        'tests/testing_instance.h',
+
+        # Test cases.
+        'tests/all_c_includes.h',
+        'tests/all_cpp_includes.h',
+        'tests/arch_dependent_sizes_32.h',
+        'tests/arch_dependent_sizes_64.h',
+        'tests/pp_thread.h',
+        'tests/test_broker.cc',
+        'tests/test_broker.h',
+        'tests/test_buffer.cc',
+        'tests/test_buffer.h',
+        'tests/test_c_includes.c',
+        'tests/test_char_set.cc',
+        'tests/test_char_set.h',
+        'tests/test_core.cc',
+        'tests/test_core.h',
+        'tests/test_cpp_includes.cc',
+        'tests/test_crypto.cc',
+        'tests/test_crypto.h',
+        'tests/test_cursor_control.cc',
+        'tests/test_cursor_control.h',
+        'tests/test_directory_reader.cc',
+        'tests/test_directory_reader.h',
+        'tests/test_file_io.cc',
+        'tests/test_file_io.h',
+        'tests/test_file_ref.cc',
+        'tests/test_file_ref.h',
+        'tests/test_file_system.cc',
+        'tests/test_file_system.h',
+        'tests/test_flash.cc',
+        'tests/test_flash.h',
+        'tests/test_flash_clipboard.cc',
+        'tests/test_flash_clipboard.h',
+        'tests/test_flash_fullscreen.cc',
+        'tests/test_flash_fullscreen.h',
+        'tests/test_fullscreen.cc',
+        'tests/test_fullscreen.h',
+        'tests/test_graphics_2d.cc',
+        'tests/test_graphics_2d.h',
+        'tests/test_graphics_3d.cc',
+        'tests/test_graphics_3d.h',
+        'tests/test_image_data.cc',
+        'tests/test_image_data.h',
+        'tests/test_input_event.cc',
+        'tests/test_input_event.h',
+        'tests/test_memory.cc',
+        'tests/test_memory.h',
+        'tests/test_net_address_private.cc',
+        'tests/test_net_address_private.h',
+        'tests/test_paint_aggregator.cc',
+        'tests/test_paint_aggregator.h',
+        'tests/test_post_message.cc',
+        'tests/test_post_message.h',
+        'tests/test_scrollbar.cc',
+        'tests/test_scrollbar.h',
+        'tests/test_struct_sizes.c',
+        'tests/test_tcp_socket_private.cc',
+        'tests/test_tcp_socket_private.h',
+        'tests/test_uma.cc',
+        'tests/test_uma.h',
+        'tests/test_url_loader.cc',
+        'tests/test_url_loader.h',
+        'tests/test_url_util.cc',
+        'tests/test_url_util.h',
+        'tests/test_utils.cc',
+        'tests/test_utils.h',
+        'tests/test_var.cc',
+        'tests/test_var.h',
+        'tests/test_video_decoder.cc',
+        'tests/test_video_decoder.h',
+        'tests/test_websocket.cc',
+        'tests/test_websocket.h',
+
+        # Deprecated test cases.
+        'tests/test_instance_deprecated.cc',
+        'tests/test_instance_deprecated.h',
+        'tests/test_var_deprecated.cc',
+        'tests/test_var_deprecated.h',
       ],
       'dependencies': [
         'ppapi.gyp:ppapi_cpp',
@@ -227,6 +309,16 @@
       ],
     },
     {
+      'target_name': 'ppapi_example_audio_input',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/audio_input/audio_input.cc',
+      ],
+    },
+    {
       'target_name': 'ppapi_example_file_chooser',
       'dependencies': [
         'ppapi_example_skeleton',
@@ -338,4 +430,96 @@
       ],
     },
   ],
+  'conditions': [
+    ['disable_nacl!=1', {
+      'targets': [
+         {
+          'target_name': 'ppapi_nacl_tests',
+          'type': 'none',
+          'dependencies': [
+             'native_client/native_client.gyp:ppapi_lib',
+             'native_client/native_client.gyp:nacl_irt',
+             'ppapi.gyp:ppapi_cpp_lib',
+           ],
+          'variables': {
+            'nexe_target': 'ppapi_nacl_tests',
+            'build_glibc': 0,
+            'build_newlib': 1,
+            'include_dirs': [
+              'lib/gl/include',
+              '..',
+            ],
+            'link_flags': [
+              '-lppapi_cpp',
+              '-lppapi',
+            ],
+            'extra_deps64': [
+              '<(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',
+            ],
+            'sources': [
+              # Common test files
+              'tests/test_case.cc',
+              'tests/test_utils.cc',
+              'tests/testing_instance.cc',
+
+              # Compile-time tests
+              'tests/test_c_includes.c',
+              'tests/test_cpp_includes.cc',
+              'tests/test_struct_sizes.c',
+              # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
+
+              # Add/uncomment PPAPI interfaces below when they get proxied.
+              # Not yet proxied.
+              #'test_broker.cc',
+              # Not yet proxied.
+              #'test_buffer.cc',
+              # Not yet proxied.
+              #'test_char_set.cc',
+              'tests/test_cursor_control.cc',
+              # Fails in DeleteDirectoryRecursively.
+              # BUG: http://code.google.com/p/nativeclient/issues/detail?id=2107
+              #'test_directory_reader.cc',
+              'tests/test_file_io.cc',
+              'tests/test_file_ref.cc',
+              'tests/test_file_system.cc',
+              'tests/test_memory.cc',
+              'tests/test_graphics_2d.cc',
+              'tests/test_image_data.cc',
+              'tests/test_paint_aggregator.cc',
+              # test_post_message.cc relies on synchronous scripting, which is not
+              # available for untrusted tests.
+              # Does not compile under nacl (uses private interface ExecuteScript).
+              #'test_post_message.cc',
+              'tests/test_scrollbar.cc',
+              # Not yet proxied.
+              #'tests/test_transport.cc',
+              # Not yet proxied.
+              #'tests/test_uma.cc',
+              # Activating the URL loader test requires a test httpd that
+              # understands HTTP POST, which our current httpd.py doesn't.
+              # It also requires deactivating the tests that use FileIOTrusted
+              # when running in NaCl.
+              #'tests/test_url_loader.cc',
+              # Does not compile under nacl (uses VarPrivate).
+              #'test_url_util.cc',
+              # Not yet proxied.
+              #'test_video_decoder.cc',
+              'tests/test_var.cc',
+
+              # Deprecated test cases.
+              #'tests/test_instance_deprecated.cc',
+              # Var_deprecated fails in TestPassReference, and we probably won't
+              # fix it.
+              #'tests/test_var_deprecated.cc'
+            ],
+          },
+        },
+      ],
+    }],
+  ],
 }