Put irt and untrusted TC dependencies behind a flag.

This helps with arm development where the PNaCl hook up will take a while.

Also:
* split ppapi_proxy.gyp into trusted and untrusted parts.
* enable nacl for arm when *not* targeting chromeos 


Review URL: http://codereview.chromium.org/8905007

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

3 files changed, 112 insertions, 101 deletions

diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 00f20bd..f9ffdb9 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -7,7 +7,7 @@
     '../../native_client/build/common.gypi',
   ],
   'conditions': [
-    ['disable_nacl!=1', {
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           'target_name': 'ppapi_lib',
@@ -79,7 +79,7 @@
             ],
           },
           'dependencies': [
-            'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib',
+            'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib',
             '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
             '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
             '../../native_client/src/shared/platform/platform.gyp:platform_lib',
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
index 21a905e..97a0a69 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
@@ -70,102 +70,5 @@
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
       ],
     },
-    {
-      'target_name': 'ppruntime_lib',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain'
-      ],
-      'variables': {
-        'nlib_target': 'libppruntime.a',
-        'build_glibc': 0,
-        'build_newlib': 1,
-        'include_dirs': [
-          '<(DEPTH)/gpu',
-          '<(DEPTH)/third_party/khronos',
-          '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',
-        ],
-        'sources': [
-          '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc',
-          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc',
-          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc',
-          '<(DEPTH)/gpu/command_buffer/common/logging.cc',
-
-          '<(DEPTH)/gpu/command_buffer/client/cmd_buffer_helper.cc',
-          '<(DEPTH)/gpu/command_buffer/client/fenced_allocator.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_c_lib.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_cmd_helper.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_implementation.cc',
-          '<(DEPTH)/gpu/command_buffer/client/program_info_manager.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_lib.cc',
-          '<(DEPTH)/gpu/command_buffer/client/mapped_memory.cc',
-          '<(DEPTH)/gpu/command_buffer/client/ring_buffer.cc',
-          '<(DEPTH)/gpu/command_buffer/common/id_allocator.cc',
-
-          'command_buffer_nacl.cc',
-          'input_event_data.cc',
-          'object_serialize.cc',
-          'plugin_callback.cc',
-          'plugin_globals.cc',
-          'plugin_instance_data.cc',
-          'plugin_main.cc',
-          'plugin_nacl_file.cc',
-          'plugin_opengles.cc',
-          'plugin_ppb.cc',
-          'plugin_ppb_audio.cc',
-          'plugin_ppb_audio_config.cc',
-          'plugin_ppb_buffer.cc',
-          'plugin_ppb_core.cc',
-          'plugin_ppb_cursor_control.cc',
-          'plugin_ppb_file_io.cc',
-          'plugin_ppb_file_system.cc',
-          'plugin_ppb_file_ref.cc',
-          'plugin_ppb_find.cc',
-          'plugin_ppb_font.cc',
-          'plugin_ppb_fullscreen.cc',
-          'plugin_ppb_graphics_2d.cc',
-          'plugin_ppb_graphics_3d.cc',
-          'plugin_ppb_image_data.cc',
-          'plugin_ppb_input_event.cc',
-          'plugin_ppb_instance.cc',
-          'plugin_ppb_memory.cc',
-          'plugin_ppb_messaging.cc',
-          'plugin_ppb_mouse_lock.cc',
-          'plugin_ppb_pdf.cc',
-          'plugin_ppb_scrollbar.cc',
-          'plugin_ppb_tcp_socket_private.cc',
-          'plugin_ppb_testing.cc',
-          'plugin_ppb_udp_socket_private.cc',
-          'plugin_ppb_url_loader.cc',
-          'plugin_ppb_url_request_info.cc',
-          'plugin_ppb_url_response_info.cc',
-          'plugin_ppb_var.cc',
-          'plugin_ppb_widget.cc',
-          'plugin_ppb_zoom.cc',
-          'plugin_ppp_find_rpc_server.cc',
-          'plugin_ppp_input_event_rpc_server.cc',
-          'plugin_ppp_instance_rpc_server.cc',
-          'plugin_ppp_messaging_rpc_server.cc',
-          'plugin_ppp_mouse_lock_rpc_server.cc',
-          'plugin_ppp_printing_rpc_server.cc',
-          'plugin_ppp_scrollbar_rpc_server.cc',
-          'plugin_ppp_selection_rpc_server.cc',
-          'plugin_ppp_widget_rpc_server.cc',
-          'plugin_ppp_zoom_rpc_server.cc',
-          'plugin_ppp_rpc_server.cc',
-          'plugin_resource.cc',
-          'plugin_resource_tracker.cc',
-          'plugin_threading.cc',
-          'plugin_upcall.cc',
-          'proxy_var.cc',
-          'proxy_var_cache.cc',
-          'utility.cc',
-          # Autogenerated files
-          'ppp_rpc_server.cc',
-          'ppb_rpc_client.cc',
-          'upcall_client.cc'
-        ],
-      },
-    },
-  ],
-}
+  ],   
+}
\ No newline at end of file
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp
new file mode 100644
index 0000000..339c0ba
--- /dev/null
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp
@@ -0,0 +1,108 @@
+# 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.
+
+{
+  'includes': [
+    '../../../../../native_client/build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'ppruntime_lib',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain'
+      ],
+      'variables': {
+        'nlib_target': 'libppruntime.a',
+        'build_glibc': 0,
+        'build_newlib': 1,
+        'include_dirs': [
+          '<(DEPTH)/gpu',
+          '<(DEPTH)/third_party/khronos',
+          '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',
+        ],
+        'sources': [
+          '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc',
+          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc',
+          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc',
+          '<(DEPTH)/gpu/command_buffer/common/logging.cc',
+
+          '<(DEPTH)/gpu/command_buffer/client/cmd_buffer_helper.cc',
+          '<(DEPTH)/gpu/command_buffer/client/fenced_allocator.cc',
+          '<(DEPTH)/gpu/command_buffer/client/gles2_c_lib.cc',
+          '<(DEPTH)/gpu/command_buffer/client/gles2_cmd_helper.cc',
+          '<(DEPTH)/gpu/command_buffer/client/gles2_implementation.cc',
+          '<(DEPTH)/gpu/command_buffer/client/program_info_manager.cc',
+          '<(DEPTH)/gpu/command_buffer/client/gles2_lib.cc',
+          '<(DEPTH)/gpu/command_buffer/client/mapped_memory.cc',
+          '<(DEPTH)/gpu/command_buffer/client/ring_buffer.cc',
+          '<(DEPTH)/gpu/command_buffer/common/id_allocator.cc',
+
+          'command_buffer_nacl.cc',
+          'input_event_data.cc',
+          'object_serialize.cc',
+          'plugin_callback.cc',
+          'plugin_globals.cc',
+          'plugin_instance_data.cc',
+          'plugin_main.cc',
+          'plugin_nacl_file.cc',
+          'plugin_opengles.cc',
+          'plugin_ppb.cc',
+          'plugin_ppb_audio.cc',
+          'plugin_ppb_audio_config.cc',
+          'plugin_ppb_buffer.cc',
+          'plugin_ppb_core.cc',
+          'plugin_ppb_cursor_control.cc',
+          'plugin_ppb_file_io.cc',
+          'plugin_ppb_file_system.cc',
+          'plugin_ppb_file_ref.cc',
+          'plugin_ppb_find.cc',
+          'plugin_ppb_font.cc',
+          'plugin_ppb_fullscreen.cc',
+          'plugin_ppb_graphics_2d.cc',
+          'plugin_ppb_graphics_3d.cc',
+          'plugin_ppb_image_data.cc',
+          'plugin_ppb_input_event.cc',
+          'plugin_ppb_instance.cc',
+          'plugin_ppb_memory.cc',
+          'plugin_ppb_messaging.cc',
+          'plugin_ppb_mouse_lock.cc',
+          'plugin_ppb_pdf.cc',
+          'plugin_ppb_scrollbar.cc',
+          'plugin_ppb_tcp_socket_private.cc',
+          'plugin_ppb_testing.cc',
+          'plugin_ppb_udp_socket_private.cc',
+          'plugin_ppb_url_loader.cc',
+          'plugin_ppb_url_request_info.cc',
+          'plugin_ppb_url_response_info.cc',
+          'plugin_ppb_var.cc',
+          'plugin_ppb_widget.cc',
+          'plugin_ppb_zoom.cc',
+          'plugin_ppp_find_rpc_server.cc',
+          'plugin_ppp_input_event_rpc_server.cc',
+          'plugin_ppp_instance_rpc_server.cc',
+          'plugin_ppp_messaging_rpc_server.cc',
+          'plugin_ppp_mouse_lock_rpc_server.cc',
+          'plugin_ppp_printing_rpc_server.cc',
+          'plugin_ppp_scrollbar_rpc_server.cc',
+          'plugin_ppp_selection_rpc_server.cc',
+          'plugin_ppp_widget_rpc_server.cc',
+          'plugin_ppp_zoom_rpc_server.cc',
+          'plugin_ppp_rpc_server.cc',
+          'plugin_resource.cc',
+          'plugin_resource_tracker.cc',
+          'plugin_threading.cc',
+          'plugin_upcall.cc',
+          'proxy_var.cc',
+          'proxy_var_cache.cc',
+          'utility.cc',
+          # Autogenerated files
+          'ppp_rpc_server.cc',
+          'ppb_rpc_client.cc',
+          'upcall_client.cc'
+        ],
+      },
+    },
+  ],
+}