Non-SFI Mode: Add disable_nacl_untrusted==0 to the condition of nacl_helper_nonsfi creation.

components/nacl_nonsfi.gyp

Index: components/nacl_nonsfi.gyp
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp
index 3bd4a13b777ce1f74f5afdd5e7c8bea93df39405..2a06df0273e987511a4be0025a6140c930d92adc 100644
--- a/components/nacl_nonsfi.gyp
+++ b/components/nacl_nonsfi.gyp
@@ -10,7 +10,7 @@
     '../build/common_untrusted.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0', {
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           # Currently, nacl_helper_nonsfi is under development and the binary
@@ -47,10 +47,10 @@
             ],
           },
           'dependencies': [
-            '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi',
-            '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '../base/base_nacl.gyp:base_nacl_nonsfi',

[hidehiko, 2014/10/20 16:40:41]

FYI: this is for standardizing the path in .gyp file.
According to some discussion like
https://groups.google.com/a/chromium.org/forum/m/#!topic/chromium-dev/y7IqhXy...,
relative path is preferred. This is originally pointed by Junichi in
crrev.com/656063003.

+            '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
+            '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
+            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
         # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.