Move nacl_defines to build.common.gypi.

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b065db8f547132b191b4c7e487e9cf55c948596e..f352f3d4381875659ebf8fc827fcefea29f17849 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -44,11 +44,6 @@
         ],
       }],
       ['OS=="win"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=1',
-          'NACL_LINUX=0',
-          'NACL_OSX=0',
-        ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_win.grd',
       },],
@@ -59,11 +54,6 @@
         ],
       }],
       ['OS=="linux"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=0',
-          'NACL_LINUX=1',
-          'NACL_OSX=0',
-        ],
         'conditions': [
           ['chromeos==1', {
             'conditions': [
@@ -87,11 +77,6 @@
       },],
       ['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': [
@@ -108,36 +93,6 @@
           }],  # 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': [
@@ -147,6 +102,7 @@
     # 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',
@@ -157,6 +113,14 @@
   ],
   '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',