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

components/nacl_nonsfi.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../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
           # does nothing (i.e. it has only empty main(), now).
           # TODO(crbug.com/358465): Implement it then switch nacl_helper in
           # Non-SFI mode to nacl_helper_nonsfi.
           'target_name': 'nacl_helper_nonsfi',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
@@ skipping 16 matching lines @@
             'conditions': [
               ['target_arch=="ia32" or target_arch=="x64"', {
                 'extra_deps_newlib32_nonsfi': [
                   '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
                 ],
               }],
             ],
           },
           '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.
       ],
     }],
   ],
 }