Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

base/base_nacl.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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common_untrusted.gypi',
@@ skipping 18 matching lines @@
               'base_switches.h',
               'strings/string16.cc',
               'sync_socket_nacl.cc',
               'time/time_posix.cc',
             ],
             'gcc_compile_flags': [
               '-fno-strict-aliasing',
             ],
           },
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
         {
           'target_name': 'base_i18n_nacl',
           'type': 'none',
           'variables': {
             'base_i18n_target': 1,
             'nacl_untrusted_build': 1,
             'nlib_target': 'libbase_i18n_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
             'build_irt': 0,
             'build_pnacl_newlib': 1,
             'sources': [
               'base_switches.cc',
               'base_switches.h',
               'strings/string16.cc',
               'sync_socket_nacl.cc',
               'time/time_posix.cc',
             ],
           },
           'dependencies': [
-            '<(DEPTH)/third_party/icu/icu_nacl.gyp:icudata_nacl',
-            '<(DEPTH)/third_party/icu/icu_nacl.gyp:icui18n_nacl',
-            '<(DEPTH)/third_party/icu/icu_nacl.gyp:icuuc_nacl',
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '../native_client/tools.gyp:prep_toolchain',
+            '../third_party/icu/icu_nacl.gyp:icudata_nacl',
+            '../third_party/icu/icu_nacl.gyp:icui18n_nacl',
+            '../third_party/icu/icu_nacl.gyp:icuuc_nacl',
           ],
         },
-      ],
-    }],
-    ['disable_nacl==0', {
-      'targets': [
         {
           'target_name': 'base_nacl_nonsfi',
           'type': 'none',
-          'include_dirs': [
-            '<(DEPTH)/native_client/src/public/linux_syscalls',
-          ],
           'variables': {
             'base_target': 1,
             'nacl_untrusted_build': 1,
             'nlib_target': 'libbase_nacl_nonsfi.a',
             'build_glibc': 0,
             'build_newlib': 0,
             'build_irt': 0,
             'build_pnacl_newlib': 0,
             'build_nonsfi_helper': 1,
 
@@ skipping 21 matching lines @@
               'rand_util_posix.cc',
 
               # For CancelableSyncSocket.
               'sync_socket_nacl.cc',
             ],
           },
           'sources!': [
             'rand_util_nacl.cc',
           ],
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-            '<(DEPTH)/third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
+            '../native_client/tools.gyp:prep_toolchain',
+            '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
           ],
         },
       ],
     }],
   ],
 }