Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

base/base_nacl.gyp

Index: base/base_nacl.gyp
diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp
index 7221d2ab77a4b4066ffb02ce24bca95ba50e4e7d..63e1ed422bde1f695ff42276283b815877b77ffe 100644
--- a/base/base_nacl.gyp
+++ b/base/base_nacl.gyp
@@ -36,7 +36,7 @@
             ],
           },
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
         {
@@ -59,22 +59,15 @@
             ],
           },
           '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,
@@ -116,8 +109,8 @@
             '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',
           ],
         },
       ],