Add #ifdefs to separate NaCl and non-NaCl PPAPI Proxy code.

ppapi/ppapi_proxy_untrusted.gyp

 # Copyright (c) 2012 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': [
@@ skipping 48 matching lines @@
           '../base/logging.cc',
           '../base/memory/ref_counted.cc',
           '../base/memory/ref_counted_memory.cc',
           '../base/memory/singleton.cc',
           '../base/memory/weak_ptr.cc',
           '../base/message_loop.cc',
           '../base/message_loop_proxy.cc',
           '../base/message_loop_proxy_impl.cc',
           '../base/message_pump.cc',
           '../base/message_pump_default.cc',
-          '../base/metrics/field_trial.cc',

[bbudge, 2012/04/17 21:59:11]

This no longer compiles. We don't seem to need it.

           '../base/metrics/histogram.cc',
           '../base/metrics/stats_counters.cc',
           '../base/metrics/stats_table.cc',
 #          '../base/native_library_posix.cc',
           '../base/os_compat_nacl.cc',
 #          '../base/path_service.cc',
           '../base/pending_task.cc',
           '../base/pickle.cc',
           '../base/platform_file.cc',
 #          '../base/platform_file_posix.cc',
@@ skipping 159 matching lines @@
           '../third_party/skia/include/config',
         ],
         'sources': [
           'shared_impl/callback_tracker.cc',
           'shared_impl/file_type_conversion.cc',
           'shared_impl/function_group_base.cc',
           'shared_impl/id_assignment.cc',
           'shared_impl/platform_file.cc',
           'shared_impl/ppapi_globals.cc',
           'shared_impl/ppapi_preferences.cc',
-          'shared_impl/ppb_audio_config_shared.cc',
-          'shared_impl/ppb_audio_input_shared.cc',
-          'shared_impl/ppb_audio_shared.cc',
+#          'shared_impl/ppb_audio_config_shared.cc',

[bbudge, 2012/04/17 21:59:11]

I aggressively removed stuff we don't need for the proof-of-concept.

+#          'shared_impl/ppb_audio_input_shared.cc',
+#          'shared_impl/ppb_audio_shared.cc',
           'shared_impl/ppb_crypto_shared.cc',
           'shared_impl/ppb_device_ref_shared.cc',
           'shared_impl/ppb_file_io_shared.cc',
           'shared_impl/ppb_file_ref_shared.cc',
 #          'shared_impl/ppb_graphics_3d_shared.cc',
-          'shared_impl/ppb_image_data_shared.cc',
+#          'shared_impl/ppb_image_data_shared.cc',
           'shared_impl/ppb_input_event_shared.cc',
           'shared_impl/ppb_instance_shared.cc',
           'shared_impl/ppb_memory_shared.cc',
 #          'shared_impl/ppb_opengles2_shared.cc',
           'shared_impl/ppb_resource_array_shared.cc',
           'shared_impl/ppb_url_request_info_shared.cc',
 #          'shared_impl/ppb_url_util_shared.cc',
           'shared_impl/ppb_var_shared.cc',
 #          'shared_impl/ppb_video_decoder_shared.cc',
 #          'shared_impl/ppb_video_capture_shared.cc',
           'shared_impl/ppb_view_shared.cc',
           'shared_impl/ppp_instance_combined.cc',
           'shared_impl/proxy_lock.cc',
           'shared_impl/resource.cc',
           'shared_impl/resource_tracker.cc',
           'shared_impl/scoped_pp_resource.cc',
           'shared_impl/time_conversion.cc',
           'shared_impl/tracked_callback.cc',
           'shared_impl/var.cc',
           'shared_impl/var_tracker.cc',
 
           'thunk/enter.cc',
-          'thunk/ppb_audio_config_thunk.cc',
-          'thunk/ppb_audio_input_thunk.cc',
-          'thunk/ppb_audio_input_trusted_thunk.cc',
-          'thunk/ppb_audio_thunk.cc',
-          'thunk/ppb_audio_trusted_thunk.cc',
-          'thunk/ppb_broker_thunk.cc',
+#          'thunk/ppb_audio_config_thunk.cc',
+#          'thunk/ppb_audio_input_thunk.cc',
+#          'thunk/ppb_audio_input_trusted_thunk.cc',
+#          'thunk/ppb_audio_thunk.cc',
+#          'thunk/ppb_audio_trusted_thunk.cc',
+#          'thunk/ppb_broker_thunk.cc',
 #          'thunk/ppb_browser_font_trusted_thunk.cc',
-          'thunk/ppb_buffer_thunk.cc',
-          'thunk/ppb_buffer_trusted_thunk.cc',
+#          'thunk/ppb_buffer_thunk.cc',
+#          'thunk/ppb_buffer_trusted_thunk.cc',
 #          'thunk/ppb_char_set_thunk.cc',
           'thunk/ppb_console_thunk.cc',
           'thunk/ppb_cursor_control_thunk.cc',
           'thunk/ppb_device_ref_thunk.cc',
-          'thunk/ppb_directory_reader_thunk.cc',
+#          'thunk/ppb_directory_reader_thunk.cc',
           'thunk/ppb_input_event_thunk.cc',
-          'thunk/ppb_file_chooser_thunk.cc',
+#          'thunk/ppb_file_chooser_thunk.cc',
           'thunk/ppb_file_io_thunk.cc',
-          'thunk/ppb_file_io_trusted_thunk.cc',
+#          'thunk/ppb_file_io_trusted_thunk.cc',
           'thunk/ppb_file_ref_thunk.cc',
           'thunk/ppb_file_system_thunk.cc',
           'thunk/ppb_find_thunk.cc',
 #          'thunk/ppb_flash_clipboard_thunk.cc',
 #          'thunk/ppb_flash_fullscreen_thunk.cc',
 #          'thunk/ppb_flash_menu_thunk.cc',
 #          'thunk/ppb_flash_message_loop_thunk.cc',
           'thunk/ppb_fullscreen_thunk.cc',
           'thunk/ppb_gamepad_thunk.cc',
 #          'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
 #          'thunk/ppb_graphics_2d_thunk.cc',
 #          'thunk/ppb_graphics_3d_thunk.cc',
 #          'thunk/ppb_graphics_3d_trusted_thunk.cc',
 #          'thunk/ppb_host_resolver_private_thunk.cc',
 #          'thunk/ppb_image_data_thunk.cc',
 #          'thunk/ppb_image_data_trusted_thunk.cc',
           'thunk/ppb_instance_thunk.cc',
-          'thunk/ppb_layer_compositor_thunk.cc',
+#          'thunk/ppb_layer_compositor_thunk.cc',
           'thunk/ppb_messaging_thunk.cc',
           'thunk/ppb_mouse_lock_thunk.cc',
           'thunk/ppb_resource_array_thunk.cc',
-          'thunk/ppb_scrollbar_thunk.cc',
-          'thunk/ppb_talk_private_thunk.cc',
+#          'thunk/ppb_scrollbar_thunk.cc',
+#          'thunk/ppb_talk_private_thunk.cc',
 #          'thunk/ppb_tcp_server_socket_private_thunk.cc',
 #          'thunk/ppb_tcp_socket_private_thunk.cc',
           'thunk/ppb_text_input_thunk.cc',
-          'thunk/ppb_transport_thunk.cc',
+#          'thunk/ppb_transport_thunk.cc',
 #          'thunk/ppb_udp_socket_private_thunk.cc',
           'thunk/ppb_url_loader_thunk.cc',
           'thunk/ppb_url_request_info_thunk.cc',
           'thunk/ppb_url_response_info_thunk.cc',
 #          'thunk/ppb_url_util_thunk.cc',
 #          'thunk/ppb_video_capture_thunk.cc',
 #          'thunk/ppb_video_decoder_thunk.cc',
 #          'thunk/ppb_video_layer_thunk.cc',
           'thunk/ppb_view_thunk.cc',
-          'thunk/ppb_websocket_thunk.cc',
+#          'thunk/ppb_websocket_thunk.cc',
           'thunk/ppb_widget_thunk.cc',
 #          'thunk/ppb_x509_certificate_private_thunk.cc',
           'thunk/ppb_zoom_thunk.cc',
 
-          'proxy/broker_dispatcher.cc',
+#          'proxy/broker_dispatcher.cc',
           'proxy/dispatcher.cc',
           'proxy/host_dispatcher.cc',
           'proxy/host_var_serialization_rules.cc',
           'proxy/interface_list.cc',
           'proxy/interface_proxy.cc',
           'proxy/plugin_array_buffer_var.cc',
           'proxy/plugin_dispatcher.cc',
           'proxy/plugin_globals.cc',
           'proxy/plugin_message_filter.cc',
           'proxy/plugin_resource_tracker.cc',
           'proxy/plugin_var_serialization_rules.cc',
           'proxy/plugin_var_tracker.cc',
           'proxy/ppapi_messages.cc',
           'proxy/ppapi_param_traits.cc',
-          'proxy/ppb_audio_input_proxy.cc',
-          'proxy/ppb_audio_proxy.cc',
-          'proxy/ppb_broker_proxy.cc',
-          'proxy/ppb_buffer_proxy.cc',
+#          'proxy/ppb_audio_input_proxy.cc',
+#          'proxy/ppb_audio_proxy.cc',
+#          'proxy/ppb_broker_proxy.cc',
+#          'proxy/ppb_buffer_proxy.cc',
           'proxy/ppb_core_proxy.cc',
 #          'proxy/ppb_file_chooser_proxy.cc',
           'proxy/ppb_file_io_proxy.cc',
           'proxy/ppb_file_ref_proxy.cc',
           'proxy/ppb_file_system_proxy.cc',
 #          'proxy/ppb_graphics_2d_proxy.cc',
 #          'proxy/ppb_graphics_3d_proxy.cc',
-          'proxy/ppb_host_resolver_private_proxy.cc',
-          'proxy/ppb_image_data_proxy.cc',
+#          'proxy/ppb_host_resolver_private_proxy.cc',
+#          'proxy/ppb_image_data_proxy.cc',
           'proxy/ppb_instance_proxy.cc',
           'proxy/ppb_message_loop_proxy.cc',
 #          'proxy/ppb_network_monitor_private_proxy.cc',
 #          'proxy/ppb_pdf_proxy.cc',
-          'proxy/ppb_talk_private_proxy.cc',
+#          'proxy/ppb_talk_private_proxy.cc',
 #          'proxy/ppb_tcp_server_socket_private_proxy.cc',
 #          'proxy/ppb_tcp_socket_private_proxy.cc',
 #          'proxy/ppb_testing_proxy.cc',
           'proxy/ppb_text_input_proxy.cc',
 #          'proxy/ppb_udp_socket_private_proxy.cc',
           'proxy/ppb_url_loader_proxy.cc',
           'proxy/ppb_url_response_info_proxy.cc',
           'proxy/ppb_var_deprecated_proxy.cc',
 #          'proxy/ppb_video_capture_proxy.cc',
 #          'proxy/ppb_video_decoder_proxy.cc',
@@ skipping 23 matching lines @@
 #          '-lppruntime',
           '-pthread',
           '-lgpu_untrusted',
           '-lipc_untrusted',
           '-lbase_untrusted',
         ],
       },
     },
   ],
 }