Chromium roll (https://codereview.chromium.org/976353002)

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': [
+    # base.gypi must be included before common_untrusted.gypi.
+    #
+    # TODO(sergeyu): Replace the target_defaults magic in base.gypi with a
+    # sources variables lists. That way order of includes will not matter.
+    'base.gypi',
     '../build/common_untrusted.gypi',
-    'base.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           'target_name': 'base_nacl',
           'type': 'none',
           'variables': {
             'base_target': 1,
             'nacl_untrusted_build': 1,
@@ skipping 88 matching lines @@
           ],
           'dependencies': [
             '../native_client/tools.gyp:prep_toolchain',
             '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
           ],
         },
       ],
     }],
   ],
 }