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

The original CL failed on Mac.

Avoid references to untrusted.gypi in WebKit

Remove include of untrusted.gypi in normal ppapi gyp files
to prevent WebKit from depending on NaCl.

Refactor PPAPI gyp files to pull out source lists which are
shared between trusted and untrusted targets.

Fix scons hack which pulls list of sources from GYP so that
we can build with scons.

This CL should allow us to revert the DEPS change:
http://trac.webkit.org/changeset/101011 on the webkit side


BUG= none
TEST= Tools/Scripts/update-webkit --chromium
TRB= dmichael@chromium.org
Review URL: http://codereview.chromium.org/8701008

TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8701010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111621 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 395 insertions, 9 deletions

diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi
index 9647242..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,7 +13,124 @@
         ],
       },
       'sources': [
-        '<@(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',
+      ],
+      'conditions': [
+        ['p2p_apis==1', {
+          'sources': [
+            'c/dev/ppb_transport_dev.h',
+          ],
+        }],
       ],
     },
     {
@@ -33,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"', {
@@ -51,6 +289,12 @@
             'WARNING_CFLAGS': ['-Wextra', '-pedantic'],
            },
         }],
+        ['p2p_apis==1', {
+          'sources': [
+            'cpp/dev/transport_dev.cc',
+            'cpp/dev/transport_dev.h',
+          ],
+        }],
       ],
     },
     {
@@ -79,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',
+          ],
+        },
+      ],
+    }],
+  ],
 }