diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi/nacl.scons | 15 | ||||
| -rw-r--r-- | ppapi/ppapi.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_cpp.gypi | 406 | ||||
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 351 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 186 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 119 |
9 files changed, 588 insertions, 497 deletions
@@ -8,7 +8,7 @@ vars = { "webkit_revision": "101168", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "7272", + "nacl_revision": "7169", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 193577c..3220cc3 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -799,7 +799,7 @@ 'conditions': [ ['disable_nacl!=1', { 'dependencies': [ - '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests', + '../ppapi/ppapi_internal.gyp:ppapi_nacl_tests', ], 'copies': [ { diff --git a/ppapi/native_client/src/shared/ppapi/nacl.scons b/ppapi/native_client/src/shared/ppapi/nacl.scons index 0aae553..55a2009 100644 --- a/ppapi/native_client/src/shared/ppapi/nacl.scons +++ b/ppapi/native_client/src/shared/ppapi/nacl.scons @@ -16,24 +16,17 @@ Dir('.').addRepository(Dir('#/../ppapi')) env.FilterOut(CCFLAGS=['-Wswitch-enum']) # Load ppapi_cpp.gypi -# Unfortunately gyp_extract does not handle variables or includes so we must -# pull the list of sources from ppapi_sources.gypi directly. - -ppapi_sources_gypi = open( - env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read() -ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_sources'] - -# From ppapi_cpp.gypi:ppapi_cpp:.*\.cc ppapi_cpp_gypi = gyp_extract.LoadGypFile( env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath) - +# From ppapi_cpp.gypi:ppapi_cpp_objects:.*\.cc +# From ppapi_cpp.gypi:ppapi_cpp:.*\.cc cpp_sources = ( - [src for src in ppapi_sources_list if src.endswith('.cc')] + + gyp_extract.GypTargetSources( + ppapi_cpp_gypi, 'ppapi_cpp_objects', '.*\.cc') + gyp_extract.GypTargetSources( ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc') ) - libppapi_cpp = env.NaClSdkLibrary('libppapi_cpp', cpp_sources) env.AddLibraryToSdk(libppapi_cpp) diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 2c3323a..7adbf5a 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -28,7 +28,7 @@ ], }, 'includes': [ - 'ppapi_sources.gypi', + '../native_client/build/untrusted.gypi', 'ppapi_cpp.gypi', 'ppapi_gl.gypi', ], diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi index b5f00ce..baa9c1b 100644 --- a/ppapi/ppapi_cpp.gypi +++ b/ppapi/ppapi_cpp.gypi @@ -2,14 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - -# Shared source lists between trusted and untrusted targets are stored in -# ppapi_sources.gypi. - { - 'includes': [ - 'ppapi_sources.gypi' - ], 'targets': [ { 'target_name': 'ppapi_c', @@ -20,9 +13,124 @@ ], }, 'sources': [ - '<@(c_sources)', - 'cpp/module_embedder.h', - 'cpp/ppp_entrypoints.cc', + 'c/pp_bool.h', + 'c/pp_completion_callback.h', + 'c/pp_errors.h', + 'c/pp_file_info.h', + 'c/pp_graphics_3d.h', + 'c/pp_input_event.h', + 'c/pp_instance.h', + 'c/pp_macros.h', + 'c/pp_module.h', + 'c/pp_point.h', + 'c/pp_rect.h', + 'c/pp_resource.h', + 'c/pp_size.h', + 'c/pp_stdint.h', + 'c/pp_time.h', + 'c/pp_var.h', + 'c/ppb.h', + 'c/ppb_audio.h', + 'c/ppb_audio_config.h', + 'c/ppb_core.h', + 'c/ppb_file_io.h', + 'c/ppb_file_ref.h', + 'c/ppb_file_system.h', + 'c/ppb_fullscreen.h', + 'c/ppb_graphics_2d.h', + 'c/ppb_graphics_3d.h', + 'c/ppb_image_data.h', + 'c/ppb_input_event.h', + 'c/ppb_instance.h', + 'c/ppb_messaging.h', + 'c/ppb_mouse_lock.h', + 'c/ppb_opengles2.h', + 'c/ppb_url_loader.h', + 'c/ppb_url_request_info.h', + 'c/ppb_url_response_info.h', + 'c/ppb_var.h', + 'c/ppp.h', + 'c/ppp_graphics_3d.h', + 'c/ppp_input_event.h', + 'c/ppp_instance.h', + 'c/ppp_messaging.h', + 'c/ppp_mouse_lock.h', + + # Dev interfaces. + 'c/dev/pp_cursor_type_dev.h', + 'c/dev/pp_video_dev.h', + 'c/dev/ppb_buffer_dev.h', + 'c/dev/ppb_char_set_dev.h', + 'c/dev/ppb_context_3d_dev.h', + 'c/dev/ppb_context_3d_trusted_dev.h', + 'c/dev/ppb_console_dev.h', + 'c/dev/ppb_cursor_control_dev.h', + 'c/dev/ppb_directory_reader_dev.h', + 'c/dev/ppb_file_chooser_dev.h', + 'c/dev/ppb_find_dev.h', + 'c/dev/ppb_font_dev.h', + 'c/dev/ppb_fullscreen_dev.h', + 'c/dev/ppb_ime_input_event_dev.h', + 'c/dev/ppb_memory_dev.h', + 'c/dev/ppb_scrollbar_dev.h', + 'c/dev/ppb_surface_3d_dev.h', + 'c/dev/ppb_testing_dev.h', + 'c/dev/ppb_url_util_dev.h', + 'c/dev/ppb_video_decoder_dev.h', + 'c/dev/ppb_websocket_dev.h', + 'c/dev/ppb_widget_dev.h', + 'c/dev/ppb_zoom_dev.h', + 'c/dev/ppp_cursor_control_dev.h', + 'c/dev/ppp_find_dev.h', + 'c/dev/ppp_network_state_dev.h', + 'c/dev/ppp_scrollbar_dev.h', + 'c/dev/ppp_selection_dev.h', + 'c/dev/ppb_text_input_dev.h', + 'c/dev/ppp_video_decoder_dev.h', + 'c/dev/ppp_widget_dev.h', + 'c/dev/ppp_zoom_dev.h', + + # Private interfaces. + 'c/private/ppb_flash.h', + 'c/private/ppb_flash_clipboard.h', + 'c/private/ppb_flash_file.h', + 'c/private/ppb_flash_fullscreen.h', + 'c/private/ppb_flash_menu.h', + 'c/private/ppb_flash_net_connector.h', + 'c/private/ppb_flash_tcp_socket.h', + 'c/private/ppb_flash_udp_socket.h', + 'c/private/ppb_gpu_blacklist_private.h', + 'c/private/ppb_instance_private.h', + 'c/private/ppb_nacl_private.h', + 'c/private/ppb_net_address_private.h', + 'c/private/ppb_pdf.h', + 'c/private/ppb_proxy_private.h', + 'c/private/ppp_instance_private.h', + 'c/private/ppb_tcp_socket_private.h', + 'c/private/ppb_udp_socket_private.h', + + # Deprecated interfaces. + 'c/dev/deprecated_bool.h', + 'c/dev/ppb_var_deprecated.h', + 'c/dev/ppp_class_deprecated.h', + + # Trusted interfaces. + 'c/trusted/ppb_audio_trusted.h', + 'c/trusted/ppb_broker_trusted.h', + 'c/trusted/ppb_buffer_trusted.h', + 'c/trusted/ppb_file_chooser_trusted.h', + 'c/trusted/ppb_file_io_trusted.h', + 'c/trusted/ppb_graphics_3d_trusted.h', + 'c/trusted/ppb_image_data_trusted.h', + 'c/trusted/ppb_url_loader_trusted.h', + 'c/trusted/ppp_broker.h', + ], + 'conditions': [ + ['p2p_apis==1', { + 'sources': [ + 'c/dev/ppb_transport_dev.h', + ], + }], ], }, { @@ -35,7 +143,135 @@ '..', ], 'sources': [ - '<@(cpp_sources)', + 'cpp/audio.cc', + 'cpp/audio.h', + 'cpp/audio_config.cc', + 'cpp/audio_config.h', + 'cpp/completion_callback.cc', + 'cpp/completion_callback.h', + 'cpp/core.cc', + 'cpp/core.h', + 'cpp/file_io.cc', + 'cpp/file_io.h', + 'cpp/file_ref.cc', + 'cpp/file_ref.h', + 'cpp/file_system.cc', + 'cpp/file_system.h', + 'cpp/fullscreen.cc', + 'cpp/fullscreen.h', + 'cpp/graphics_2d.cc', + 'cpp/graphics_2d.h', + 'cpp/graphics_3d.cc', + 'cpp/graphics_3d.h', + 'cpp/graphics_3d_client.cc', + 'cpp/graphics_3d_client.h', + 'cpp/image_data.cc', + 'cpp/image_data.h', + 'cpp/input_event.cc', + 'cpp/input_event.h', + 'cpp/instance.cc', + 'cpp/instance.h', + 'cpp/logging.h', + 'cpp/module.cc', + 'cpp/module.h', + 'cpp/module_impl.h', + 'cpp/mouse_lock.cc', + 'cpp/mouse_lock.h', + 'cpp/non_thread_safe_ref_count.h', + 'cpp/paint_aggregator.cc', + 'cpp/paint_aggregator.h', + 'cpp/paint_manager.cc', + 'cpp/paint_manager.h', + 'cpp/point.h', + 'cpp/rect.cc', + 'cpp/rect.h', + 'cpp/resource.cc', + 'cpp/resource.h', + 'cpp/size.h', + 'cpp/url_loader.cc', + 'cpp/url_loader.h', + 'cpp/url_request_info.cc', + 'cpp/url_request_info.h', + 'cpp/url_response_info.cc', + 'cpp/url_response_info.h', + 'cpp/var.cc', + 'cpp/var.h', + + # Dev interfaces. + 'cpp/dev/audio_input_dev.cc', + 'cpp/dev/audio_input_dev.h', + 'cpp/dev/buffer_dev.cc', + 'cpp/dev/buffer_dev.h', + 'cpp/dev/context_3d_dev.cc', + 'cpp/dev/context_3d_dev.h', + 'cpp/dev/directory_entry_dev.cc', + 'cpp/dev/directory_entry_dev.h', + 'cpp/dev/directory_reader_dev.cc', + 'cpp/dev/directory_reader_dev.h', + 'cpp/dev/file_chooser_dev.cc', + 'cpp/dev/file_chooser_dev.h', + 'cpp/dev/find_dev.cc', + 'cpp/dev/find_dev.h', + 'cpp/dev/font_dev.cc', + 'cpp/dev/font_dev.h', + 'cpp/dev/fullscreen_dev.cc', + 'cpp/dev/fullscreen_dev.h', + 'cpp/dev/ime_input_event_dev.cc', + 'cpp/dev/ime_input_event_dev.h', + 'cpp/dev/memory_dev.cc', + 'cpp/dev/memory_dev.h', + 'cpp/dev/printing_dev.cc', + 'cpp/dev/printing_dev.h', + 'cpp/dev/scrollbar_dev.cc', + 'cpp/dev/scrollbar_dev.h', + 'cpp/dev/selection_dev.cc', + 'cpp/dev/selection_dev.h', + 'cpp/dev/surface_3d_dev.cc', + 'cpp/dev/surface_3d_dev.h', + 'cpp/dev/text_input_dev.cc', + 'cpp/dev/text_input_dev.h', + 'cpp/dev/url_util_dev.cc', + 'cpp/dev/url_util_dev.h', + 'cpp/dev/video_capture_client_dev.cc', + 'cpp/dev/video_capture_client_dev.h', + 'cpp/dev/video_capture_dev.cc', + 'cpp/dev/video_capture_dev.h', + 'cpp/dev/video_decoder_client_dev.cc', + 'cpp/dev/video_decoder_client_dev.h', + 'cpp/dev/video_decoder_dev.cc', + 'cpp/dev/video_decoder_dev.h', + 'cpp/dev/widget_client_dev.cc', + 'cpp/dev/widget_client_dev.h', + 'cpp/dev/widget_dev.cc', + 'cpp/dev/widget_dev.h', + 'cpp/dev/zoom_dev.cc', + 'cpp/dev/zoom_dev.h', + + # Deprecated interfaces. + 'cpp/dev/scriptable_object_deprecated.h', + 'cpp/dev/scriptable_object_deprecated.cc', + + # Private interfaces. + 'cpp/private/flash_fullscreen.cc', + 'cpp/private/flash_fullscreen.h', + 'cpp/private/flash_menu.cc', + 'cpp/private/flash_menu.h', + 'cpp/private/flash_net_connector.cc', + 'cpp/private/flash_net_connector.h', + 'cpp/private/instance_private.cc', + 'cpp/private/instance_private.h', + 'cpp/private/net_address_private.cc', + 'cpp/private/net_address_private.h', + 'cpp/private/tcp_socket_private.cc', + 'cpp/private/tcp_socket_private.h', + 'cpp/private/udp_socket_private.cc', + 'cpp/private/udp_socket_private.h', + 'cpp/private/var_private.cc', + 'cpp/private/var_private.h', + + # Trusted interfaces. + 'cpp/trusted/file_chooser_trusted.cc', + 'cpp/trusted/file_chooser_trusted.h', ], 'conditions': [ ['OS=="win"', { @@ -53,6 +289,12 @@ 'WARNING_CFLAGS': ['-Wextra', '-pedantic'], }, }], + ['p2p_apis==1', { + 'sources': [ + 'cpp/dev/transport_dev.cc', + 'cpp/dev/transport_dev.h', + ], + }], ], }, { @@ -81,4 +323,146 @@ ], }, ], + 'conditions': [ + ['disable_nacl!=1', { + 'targets' : [ + { + 'target_name': 'ppapi_cpp_lib', + 'type': 'none', + 'variables': { + 'nlib_target': 'libppapi_cpp.a', + 'build_glibc': 0, + 'build_newlib': 1, + 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', + 'sources': [ + 'cpp/audio.cc', + 'cpp/audio.h', + 'cpp/audio_config.cc', + 'cpp/audio_config.h', + 'cpp/completion_callback.cc', + 'cpp/completion_callback.h', + 'cpp/core.cc', + 'cpp/core.h', + 'cpp/file_io.cc', + 'cpp/file_io.h', + 'cpp/file_ref.cc', + 'cpp/file_ref.h', + 'cpp/file_system.cc', + 'cpp/file_system.h', + 'cpp/fullscreen.cc', + 'cpp/fullscreen.h', + 'cpp/graphics_2d.cc', + 'cpp/graphics_2d.h', + 'cpp/graphics_3d.cc', + 'cpp/graphics_3d.h', + 'cpp/graphics_3d_client.cc', + 'cpp/graphics_3d_client.h', + 'cpp/image_data.cc', + 'cpp/image_data.h', + 'cpp/input_event.cc', + 'cpp/input_event.h', + 'cpp/instance.cc', + 'cpp/instance.h', + 'cpp/logging.h', + 'cpp/module.cc', + 'cpp/module.h', + 'cpp/module_impl.h', + 'cpp/mouse_lock.cc', + 'cpp/mouse_lock.h', + 'cpp/non_thread_safe_ref_count.h', + 'cpp/paint_aggregator.cc', + 'cpp/paint_aggregator.h', + 'cpp/paint_manager.cc', + 'cpp/paint_manager.h', + 'cpp/point.h', + 'cpp/rect.cc', + 'cpp/rect.h', + 'cpp/resource.cc', + 'cpp/resource.h', + 'cpp/size.h', + 'cpp/url_loader.cc', + 'cpp/url_loader.h', + 'cpp/url_request_info.cc', + 'cpp/url_request_info.h', + 'cpp/url_response_info.cc', + 'cpp/url_response_info.h', + 'cpp/var.cc', + 'cpp/var.h', + + # Dev interfaces. + 'cpp/dev/buffer_dev.cc', + 'cpp/dev/buffer_dev.h', + 'cpp/dev/context_3d_dev.cc', + 'cpp/dev/context_3d_dev.h', + 'cpp/dev/directory_entry_dev.cc', + 'cpp/dev/directory_entry_dev.h', + 'cpp/dev/directory_reader_dev.cc', + 'cpp/dev/directory_reader_dev.h', + 'cpp/dev/file_chooser_dev.cc', + 'cpp/dev/file_chooser_dev.h', + 'cpp/dev/find_dev.cc', + 'cpp/dev/find_dev.h', + 'cpp/dev/font_dev.cc', + 'cpp/dev/font_dev.h', + 'cpp/dev/fullscreen_dev.cc', + 'cpp/dev/fullscreen_dev.h', + 'cpp/dev/ime_input_event_dev.cc', + 'cpp/dev/ime_input_event_dev.h', + 'cpp/dev/memory_dev.cc', + 'cpp/dev/memory_dev.h', + 'cpp/dev/printing_dev.cc', + 'cpp/dev/printing_dev.h', + 'cpp/dev/scrollbar_dev.cc', + 'cpp/dev/scrollbar_dev.h', + 'cpp/dev/selection_dev.cc', + 'cpp/dev/selection_dev.h', + 'cpp/dev/surface_3d_dev.cc', + 'cpp/dev/surface_3d_dev.h', + 'cpp/dev/text_input_dev.cc', + 'cpp/dev/text_input_dev.h', + 'cpp/dev/url_util_dev.cc', + 'cpp/dev/url_util_dev.h', + 'cpp/dev/video_capture_client_dev.cc', + 'cpp/dev/video_capture_client_dev.h', + 'cpp/dev/video_capture_dev.cc', + 'cpp/dev/video_capture_dev.h', + 'cpp/dev/video_decoder_client_dev.cc', + 'cpp/dev/video_decoder_client_dev.h', + 'cpp/dev/video_decoder_dev.cc', + 'cpp/dev/video_decoder_dev.h', + 'cpp/dev/widget_client_dev.cc', + 'cpp/dev/widget_client_dev.h', + 'cpp/dev/widget_dev.cc', + 'cpp/dev/widget_dev.h', + 'cpp/dev/zoom_dev.cc', + 'cpp/dev/zoom_dev.h', + + # Deprecated interfaces. + 'cpp/dev/scriptable_object_deprecated.h', + 'cpp/dev/scriptable_object_deprecated.cc', + + # Private interfaces. + 'cpp/private/flash_fullscreen.cc', + 'cpp/private/flash_fullscreen.h', + 'cpp/private/instance_private.cc', + 'cpp/private/instance_private.h', + 'cpp/private/var_private.cc', + 'cpp/private/var_private.h', + + # Trusted interfaces. + 'cpp/trusted/file_chooser_trusted.cc', + 'cpp/trusted/file_chooser_trusted.h', + + # Entrypoints + 'cpp/module_embedder.h', + 'cpp/ppp_entrypoints.cc', + ], + }, + 'dependencies': [ + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', + ], + }, + ], + }], + ], } diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 6bf0565..1a9b476 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -24,7 +24,7 @@ ], }, 'includes': [ - 'ppapi_sources.gypi', + '../native_client/build/untrusted.gypi', 'ppapi_proxy.gypi', 'ppapi_shared.gypi', 'ppapi_tests.gypi', diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi deleted file mode 100644 index f78493e..0000000 --- a/ppapi/ppapi_sources.gypi +++ /dev/null @@ -1,351 +0,0 @@ -# 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. - -{ - 'variables': { - 'c_sources': [ - 'c/pp_bool.h', - 'c/pp_completion_callback.h', - 'c/pp_errors.h', - 'c/pp_file_info.h', - 'c/pp_graphics_3d.h', - 'c/pp_input_event.h', - 'c/pp_instance.h', - 'c/pp_macros.h', - 'c/pp_module.h', - 'c/pp_point.h', - 'c/pp_rect.h', - 'c/pp_resource.h', - 'c/pp_size.h', - 'c/pp_stdint.h', - 'c/pp_time.h', - 'c/pp_var.h', - 'c/ppb.h', - 'c/ppb_audio.h', - 'c/ppb_audio_config.h', - 'c/ppb_core.h', - 'c/ppb_file_io.h', - 'c/ppb_file_ref.h', - 'c/ppb_file_system.h', - 'c/ppb_fullscreen.h', - 'c/ppb_graphics_2d.h', - 'c/ppb_graphics_3d.h', - 'c/ppb_image_data.h', - 'c/ppb_input_event.h', - 'c/ppb_instance.h', - 'c/ppb_messaging.h', - 'c/ppb_mouse_lock.h', - 'c/ppb_opengles2.h', - 'c/ppb_url_loader.h', - 'c/ppb_url_request_info.h', - 'c/ppb_url_response_info.h', - 'c/ppb_var.h', - 'c/ppp.h', - 'c/ppp_graphics_3d.h', - 'c/ppp_input_event.h', - 'c/ppp_instance.h', - 'c/ppp_messaging.h', - 'c/ppp_mouse_lock.h', - - # Dev interfaces. - 'c/dev/pp_cursor_type_dev.h', - 'c/dev/pp_video_dev.h', - 'c/dev/ppb_buffer_dev.h', - 'c/dev/ppb_char_set_dev.h', - 'c/dev/ppb_context_3d_dev.h', - 'c/dev/ppb_context_3d_trusted_dev.h', - 'c/dev/ppb_console_dev.h', - 'c/dev/ppb_cursor_control_dev.h', - 'c/dev/ppb_directory_reader_dev.h', - 'c/dev/ppb_file_chooser_dev.h', - 'c/dev/ppb_find_dev.h', - 'c/dev/ppb_font_dev.h', - 'c/dev/ppb_fullscreen_dev.h', - 'c/dev/ppb_ime_input_event_dev.h', - 'c/dev/ppb_memory_dev.h', - 'c/dev/ppb_scrollbar_dev.h', - 'c/dev/ppb_surface_3d_dev.h', - 'c/dev/ppb_testing_dev.h', - 'c/dev/ppb_url_util_dev.h', - 'c/dev/ppb_video_decoder_dev.h', - 'c/dev/ppb_websocket_dev.h', - 'c/dev/ppb_widget_dev.h', - 'c/dev/ppb_zoom_dev.h', - 'c/dev/ppp_cursor_control_dev.h', - 'c/dev/ppp_find_dev.h', - 'c/dev/ppp_network_state_dev.h', - 'c/dev/ppp_scrollbar_dev.h', - 'c/dev/ppp_selection_dev.h', - 'c/dev/ppb_text_input_dev.h', - 'c/dev/ppp_video_decoder_dev.h', - 'c/dev/ppp_widget_dev.h', - 'c/dev/ppp_zoom_dev.h', - - # Private interfaces. - 'c/private/ppb_flash.h', - 'c/private/ppb_flash_clipboard.h', - 'c/private/ppb_flash_file.h', - 'c/private/ppb_flash_fullscreen.h', - 'c/private/ppb_flash_menu.h', - 'c/private/ppb_flash_net_connector.h', - 'c/private/ppb_flash_tcp_socket.h', - 'c/private/ppb_flash_udp_socket.h', - 'c/private/ppb_gpu_blacklist_private.h', - 'c/private/ppb_instance_private.h', - 'c/private/ppb_nacl_private.h', - 'c/private/ppb_net_address_private.h', - 'c/private/ppb_pdf.h', - 'c/private/ppb_proxy_private.h', - 'c/private/ppp_instance_private.h', - 'c/private/ppb_tcp_socket_private.h', - 'c/private/ppb_udp_socket_private.h', - - # Deprecated interfaces. - 'c/dev/deprecated_bool.h', - 'c/dev/ppb_var_deprecated.h', - 'c/dev/ppp_class_deprecated.h', - - # Trusted interfaces. - 'c/trusted/ppb_audio_trusted.h', - 'c/trusted/ppb_broker_trusted.h', - 'c/trusted/ppb_buffer_trusted.h', - 'c/trusted/ppb_file_chooser_trusted.h', - 'c/trusted/ppb_file_io_trusted.h', - 'c/trusted/ppb_graphics_3d_trusted.h', - 'c/trusted/ppb_image_data_trusted.h', - 'c/trusted/ppb_url_loader_trusted.h', - 'c/trusted/ppp_broker.h', - ], - - 'cpp_sources': [ - 'cpp/audio.cc', - 'cpp/audio.h', - 'cpp/audio_config.cc', - 'cpp/audio_config.h', - 'cpp/completion_callback.cc', - 'cpp/completion_callback.h', - 'cpp/core.cc', - 'cpp/core.h', - 'cpp/file_io.cc', - 'cpp/file_io.h', - 'cpp/file_ref.cc', - 'cpp/file_ref.h', - 'cpp/file_system.cc', - 'cpp/file_system.h', - 'cpp/fullscreen.cc', - 'cpp/fullscreen.h', - 'cpp/graphics_2d.cc', - 'cpp/graphics_2d.h', - 'cpp/graphics_3d.cc', - 'cpp/graphics_3d.h', - 'cpp/graphics_3d_client.cc', - 'cpp/graphics_3d_client.h', - 'cpp/image_data.cc', - 'cpp/image_data.h', - 'cpp/input_event.cc', - 'cpp/input_event.h', - 'cpp/instance.cc', - 'cpp/instance.h', - 'cpp/logging.h', - 'cpp/module.cc', - 'cpp/module.h', - 'cpp/module_impl.h', - 'cpp/mouse_lock.cc', - 'cpp/mouse_lock.h', - 'cpp/non_thread_safe_ref_count.h', - 'cpp/paint_aggregator.cc', - 'cpp/paint_aggregator.h', - 'cpp/paint_manager.cc', - 'cpp/paint_manager.h', - 'cpp/point.h', - 'cpp/rect.cc', - 'cpp/rect.h', - 'cpp/resource.cc', - 'cpp/resource.h', - 'cpp/size.h', - 'cpp/url_loader.cc', - 'cpp/url_loader.h', - 'cpp/url_request_info.cc', - 'cpp/url_request_info.h', - 'cpp/url_response_info.cc', - 'cpp/url_response_info.h', - 'cpp/var.cc', - 'cpp/var.h', - - # Dev interfaces. - 'cpp/dev/audio_input_dev.cc', - 'cpp/dev/audio_input_dev.h', - 'cpp/dev/buffer_dev.cc', - 'cpp/dev/buffer_dev.h', - 'cpp/dev/context_3d_dev.cc', - 'cpp/dev/context_3d_dev.h', - 'cpp/dev/directory_entry_dev.cc', - 'cpp/dev/directory_entry_dev.h', - 'cpp/dev/directory_reader_dev.cc', - 'cpp/dev/directory_reader_dev.h', - 'cpp/dev/file_chooser_dev.cc', - 'cpp/dev/file_chooser_dev.h', - 'cpp/dev/find_dev.cc', - 'cpp/dev/find_dev.h', - 'cpp/dev/font_dev.cc', - 'cpp/dev/font_dev.h', - 'cpp/dev/fullscreen_dev.cc', - 'cpp/dev/fullscreen_dev.h', - 'cpp/dev/ime_input_event_dev.cc', - 'cpp/dev/ime_input_event_dev.h', - 'cpp/dev/memory_dev.cc', - 'cpp/dev/memory_dev.h', - 'cpp/dev/printing_dev.cc', - 'cpp/dev/printing_dev.h', - 'cpp/dev/scrollbar_dev.cc', - 'cpp/dev/scrollbar_dev.h', - 'cpp/dev/selection_dev.cc', - 'cpp/dev/selection_dev.h', - 'cpp/dev/surface_3d_dev.cc', - 'cpp/dev/surface_3d_dev.h', - 'cpp/dev/text_input_dev.cc', - 'cpp/dev/text_input_dev.h', - 'cpp/dev/url_util_dev.cc', - 'cpp/dev/url_util_dev.h', - 'cpp/dev/video_capture_client_dev.cc', - 'cpp/dev/video_capture_client_dev.h', - 'cpp/dev/video_capture_dev.cc', - 'cpp/dev/video_capture_dev.h', - 'cpp/dev/video_decoder_client_dev.cc', - 'cpp/dev/video_decoder_client_dev.h', - 'cpp/dev/video_decoder_dev.cc', - 'cpp/dev/video_decoder_dev.h', - 'cpp/dev/widget_client_dev.cc', - 'cpp/dev/widget_client_dev.h', - 'cpp/dev/widget_dev.cc', - 'cpp/dev/widget_dev.h', - 'cpp/dev/zoom_dev.cc', - 'cpp/dev/zoom_dev.h', - - # Deprecated interfaces. - 'cpp/dev/scriptable_object_deprecated.h', - 'cpp/dev/scriptable_object_deprecated.cc', - - # Private interfaces. - 'cpp/private/flash_fullscreen.cc', - 'cpp/private/flash_fullscreen.h', - 'cpp/private/flash_menu.cc', - 'cpp/private/flash_menu.h', - 'cpp/private/flash_net_connector.cc', - 'cpp/private/flash_net_connector.h', - 'cpp/private/instance_private.cc', - 'cpp/private/instance_private.h', - 'cpp/private/net_address_private.cc', - 'cpp/private/net_address_private.h', - 'cpp/private/tcp_socket_private.cc', - 'cpp/private/tcp_socket_private.h', - 'cpp/private/udp_socket_private.cc', - 'cpp/private/udp_socket_private.h', - 'cpp/private/var_private.cc', - 'cpp/private/var_private.h', - - # Trusted interfaces. - 'cpp/trusted/file_chooser_trusted.cc', - 'cpp/trusted/file_chooser_trusted.h', - ], - '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', - ], - }, - 'conditions': [ - ['p2p_apis==1', { - 'variables': { - 'c_sources': [ - 'c/dev/ppb_transport_dev.h', - ], - 'cpp_sources': [ - 'cpp/dev/transport_dev.cc', - 'cpp/dev/transport_dev.h', - ], - }, - }], - ], -} diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 178b0e5..3c8b695 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -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' + ], + }, + }, + ], + }], + ], } diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp deleted file mode 100644 index 7b3ceb9..0000000 --- a/ppapi/ppapi_untrusted.gyp +++ /dev/null @@ -1,119 +0,0 @@ -# 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. - -# This GYP file defines untrusted (NaCl) targets. All targets in this -# file should be conditionally depended upon via 'disable_nacl!=1' to avoid -# requiring NaCl sources for building. - -{ - 'includes': [ - '../native_client/build/untrusted.gypi', - 'ppapi_sources.gypi', - ], - 'targets': [ - { - 'target_name': 'ppapi_cpp_lib', - 'type': 'none', - 'variables': { - 'nlib_target': 'libppapi_cpp.a', - 'build_glibc': 0, - 'build_newlib': 1, - 'sources': [ - '<@(cpp_sources)', - 'cpp/module_embedder.h', - 'cpp/ppp_entrypoints.cc', - ], - }, - 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', - ], - }, - { - 'target_name': 'ppapi_nacl_tests', - 'type': 'none', - 'dependencies': [ - 'ppapi_cpp_lib', - 'native_client/native_client.gyp:ppapi_lib', - 'native_client/native_client.gyp:nacl_irt', - ], - 'variables': { - 'nexe_target': 'ppapi_nacl_tests', - 'build_glibc': 0, - 'build_newlib': 1, - 'include_dirs': [ - 'lib/gl/include', - '..', - ], - 'link_flags': [ - '-lppapi_cpp', - '-lppapi', - ], - 'extra_deps64': [ - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi_cpp.a', - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi.a', - ], - 'extra_deps32': [ - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi_cpp.a', - '<(PRODUCT_DIR)/obj/gen/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' - ], - }, - }, - ], -} |