Add untrusted NaCl build for PPAPI proxy.

build/all.gyp

Index: build/all.gyp
===================================================================
--- build/all.gyp	(revision 142376)
+++ build/all.gyp	(working copy)
@@ -18,13 +18,11 @@
         '../gpu/gpu.gyp:*',
         '../gpu/tools/tools.gyp:*',
         '../ipc/ipc.gyp:*',
-        '../ipc/ipc_untrusted.gyp:*',
         '../jingle/jingle.gyp:*',
         '../media/media.gyp:*',
         '../net/net.gyp:*',
         '../ppapi/ppapi.gyp:*',
         '../ppapi/ppapi_internal.gyp:*',
-        '../ppapi/ppapi_proxy_untrusted.gyp:*',
         '../printing/printing.gyp:*',
         '../sdch/sdch.gyp:*',
         '../skia/skia.gyp:*',
@@ -145,6 +143,14 @@
             '../net/third_party/nss/ssl.gyp:*',
           ],
         }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            '../base/base_untrusted.gyp:*',
+            '../ipc/ipc_untrusted.gyp:*',
+            '../ppapi/ppapi_proxy_untrusted.gyp:*',
+            '../ppapi/ppapi_shared_untrusted.gyp:*',
+          ],
+        }],
       ],
     }, # target_name: All
     {
@@ -187,9 +193,6 @@
         '../gpu/gpu.gyp:gpu_unittests',
         '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
         '../ipc/ipc.gyp:ipc_tests',
-        # TODO(bbudge): drop this when something meaningful depends on
-        # ipc_untrusted.
-        '../ipc/ipc_untrusted.gyp:ipc_untrusted',
         '../jingle/jingle.gyp:jingle_unittests',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
@@ -224,6 +227,12 @@
             '../webkit/webkit.gyp:test_shell_common',
            ],
         }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC.
+            '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
+          ],
+        }],
       ],
     }, # target_name: chromium_builder_tests
     {