Move nacl_defines to build.common.gypi.

chrome/chrome.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,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 26 matching lines @@
           'plugin',
           'renderer',
           'utility',
           '../content/content.gyp:content_gpu',
           '../content/content.gyp:content_ppapi_plugin',
           '../content/content.gyp:content_worker',
           '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources',
         ],
       }],
       ['OS=="win"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=1',
-          'NACL_LINUX=0',
-          'NACL_OSX=0',
-        ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_win.grd',
       },],
       ['OS!="android" and OS!="ios"', {
         'chromium_browser_dependencies': [
           # Android doesn't use the service process (only needed for print).
           'service',
         ],
       }],
       ['OS=="linux"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=0',
-          'NACL_LINUX=1',
-          'NACL_OSX=0',
-        ],
         'conditions': [
           ['chromeos==1', {
             'conditions': [
               ['branding=="Chrome"', {
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_google_chromeos.grd',
               }, {  # branding!=Chrome
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_chromiumos.grd',
               }],
             ]
           }, {  # chromeos==0
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_linux.grd',
           }],
         ],
       },],
       ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', {
         'platform_locale_settings_grd':
             'app/resources/locale_settings_linux.grd',
       },],
       ['OS=="mac"', {
         'tweak_info_plist_path': '../build/mac/tweak_info_plist.py',
-        'nacl_defines': [
-          'NACL_WINDOWS=0',
-          'NACL_LINUX=0',
-          'NACL_OSX=1',
-        ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_mac.grd',
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
             # The policy .grd file also needs the bundle id.
             'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'],
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
             # The policy .grd file also needs the bundle id.
             'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'],
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
-      # TODO(mcgrathr): This duplicates native_client/build/common.gypi;
-      # we should figure out a way to unify the settings.
-      ['target_arch=="ia32"', {
-        'nacl_defines': [
-          'NACL_TARGET_SUBARCH=32',
-          'NACL_TARGET_ARCH=x86',
-          'NACL_BUILD_SUBARCH=32',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="x64"', {
-        'nacl_defines': [
-          'NACL_TARGET_SUBARCH=64',
-          'NACL_TARGET_ARCH=x86',
-          'NACL_BUILD_SUBARCH=64',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="arm"', {
-        'nacl_defines': [
-          'NACL_BUILD_ARCH=arm',
-          'NACL_BUILD_SUBARCH=32',
-          'NACL_TARGET_ARCH=arm',
-          'NACL_TARGET_SUBARCH=32',
-        ],
-      }],
-      ['target_arch=="mipsel"', {
-        'nacl_defines': [
-        ],
-      }],
     ],  # conditions
   },  # variables
   'includes': [
     # Place some targets in gypi files to reduce contention on this file.
     # By using an include, we keep everything in a single xcodeproj file.
     # Note on Win64 targets: targets that end with win64 be used
     # on 64-bit Windows only. Targets that end with nacl_win64 should be used
     # by Native Client only.
     # NOTE: Most new includes should go in the OS!="ios" condition below.
+    '../build/nacl_defines.gypi',
     '../build/win_precompile.gypi',
     'chrome_browser.gypi',
     'chrome_browser_ui.gypi',
     'chrome_common.gypi',
     'chrome_installer_util.gypi',
     'chrome_tests_unit.gypi',
     'version.gypi',
   ],
   'conditions': [
     ['OS!="ios"', {
+      'defines': [

[Mark Seaborn, 2013/07/28 00:41:07]

In the removed code, there's nothing about the field 'defines', only
'nacl_defines'.  How come you're adding a 'defines' field here?

+        '<@(nacl_defines)',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          '<@(nacl_defines)',
+        ],
+      },
       'includes': [
         'app/policy/policy_templates.gypi',
         'chrome_browser_extensions.gypi',
         'chrome_dll.gypi',
         'chrome_exe.gypi',
         'chrome_installer.gypi',
         'chrome_renderer.gypi',
         'chrome_tests.gypi',
         'nacl.gypi',
         '../apps/apps.gypi',
@@ skipping 1064 matching lines @@
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
     ['configuration_policy==1 and OS!="android"', {
       'includes': [ 'policy.gypi', ],
     }],
   ],  # 'conditions'
 }