NaCl: Remove use of NACL_BUILD_* in common.gypi.

build/common.gypi

 # 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': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 169 matching lines @@
       # for instance).
       '../src/third_party',
       '../..',
     ],
     'variables': {
       'win_target': 'x32',
     },
     'target_conditions': [
       ['win_target=="x64"', {
         'target_arch': 'x64',
-        'defines!': [
-          'NACL_BUILD_SUBARCH=32',
-        ],
-        'defines': [
-          'NACL_BUILD_SUBARCH=64',
-        ],
         'configurations': {
           'Common_Base': {
             'msvs_target_platform': 'x64',
           },
         },
       }],
     ],
     'conditions': [
-      # TODO(gregoryd): split target and build subarchs
-      ['target_arch=="ia32"', {
-        'defines': [
-          'NACL_BUILD_SUBARCH=32',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="x64"', {
-        'defines': [
-          'NACL_BUILD_SUBARCH=64',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="arm"', {
-        'defines': [
-          'NACL_BUILD_ARCH=arm',
-          'NACL_BUILD_SUBARCH=32',
-        ],
-      }],
-      ['target_arch=="mipsel"', {
-        'defines': [
-          'NACL_BUILD_ARCH=mips',
-          'NACL_BUILD_SUBARCH=32',
-        ],
-      }],
       ['linux2==1', {
         'defines': ['LINUX2=1'],
       }],
       ['OS=="win"', {
         'defines': [ 'NOMINMAX' ]
       }],
       ['coverage!=0', {
         'conditions': [
           ['OS=="mac"', {
             'xcode_settings': {
@@ skipping 578 matching lines @@
     # 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',
   },
   'includes': [
     'untrusted.gypi',
   ],
 }