Move the definition of disable_nacl% inside a conditional

build/common.gypi

 # Copyright (c) 2011 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 521 matching lines @@
 
     # Disable shadow stack keeping used by heapcheck to unwind the stacks
     # better.
     'linux_keep_shadow_stacks%': 0,
 
     # Set to 1 to link against libgnome-keyring instead of using dlopen().
     'linux_link_gnome_keyring%': 0,
     # Set to 1 to link against gsettings APIs instead of using dlopen().
     'linux_link_gsettings%': 0,
 
-    # Used to disable Native Client at compile time, for platforms where it
-    # isn't supported
-    'disable_nacl%': 0,
-
     # Set Thumb compilation flags.
     'arm_thumb%': 0,
 
     # Set ARM fpu compilation flags (only meaningful if armv7==1 and
     # arm_neon==0).
     'arm_fpu%': 'vfpv3',
 
     # Enable new NPDevice API.
     'enable_new_npdevice_api%': 0,
 
@@ skipping 45 matching lines @@
     # If debug_devtools is set to 1, JavaScript files for DevTools are
     # stored as is and loaded from disk. Otherwise, a concatenated file
     # is stored in resources.pak. It is still possible to load JS files
     # from disk by passing --debug-devtools cmdline switch.
     'debug_devtools%': 0,
 
     # Point to ICU directory.
     'icu_src_dir': '../third_party/icu',
 
     'conditions': [
+      # Used to disable Native Client at compile time, for platforms where it
+      # isn't supported (ARM)
+      ['target_arch=="arm"', {
+        'disable_nacl%': 1,
+       }, {
+        'disable_nacl%': 0,
+      }],
       ['os_posix==1 and OS!="mac" and OS!="android"', {
         # This will set gcc_version to XY if you are running gcc X.Y.*.
         # This is used to tweak build flags for gcc 4.4.
         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
         # Figure out the python architecture to decide if we build pyauto.
         'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
         'conditions': [
           ['branding=="Chrome"', {
             'linux_breakpad%': 1,
           }],
@@ skipping 1944 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }