Revert of untrusted.gyp to fix goma_status=ok error.

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 68 matching lines @@
         # Override buildtype to select the desired build flavor.
         # Dev - everyday build for development/testing
         # Official - release build (generally implies additional processing)
         # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
         # conversion is done), some of the things which are now controlled by
         # 'branding', such as symbol generation, will need to be refactored
         # based on 'buildtype' (i.e. we don't care about saving symbols for
         # non-Official builds).
         'buildtype%': 'Dev',
 
-        # goma settings.
-        'goma_status%': '',
-        'gomadir%': '',
-
         'conditions': [
           # Compute the architecture that we're building for. Default to the
           # architecture that we're building on.
           ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
             # This handles the Linux platforms we generally deal with. Anything
             # else gets passed through, which probably won't work very well;
             # such hosts should pass an explicit target_arch to gyp.
             #
             # NOTE: currently only nacl is generating gyp files on an arm board.
             #    The arm.* -> arm substitution in chrome's common.gypi isn't
             #    appropriate in that context as we actually use target_arch==arm
             #    to me x86 -> arm cross compile. When actually running on an arm
             #    board, we'll generate ia32 for now, so that the generation
             #    succeeds.
             'target_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/ia32/")'
           }, {  # OS!="linux"
             'target_arch%': 'ia32',
           }],
         ]
       },
       # These come from the above variable scope.
       'nacl_standalone%': '<(nacl_standalone)',
       'target_arch%': '<(target_arch)',
       'branding%': '<(branding)',
       'buildtype%': '<(buildtype)',
-      'goma_status%': '<(goma_status)',
-      'gomadir%': '<(gomadir)',
 
       'conditions': [
         # The system root for cross-compiles. Default: none.
         # If we are building in chrome we want to rely on chrome's default, which
         # means we can't set a default here.
         ['nacl_standalone!=0', {
           'sysroot%': '',
         }],
       ],
 
       # This variable is to allow us to build components as either static
       # libraries or dynamic shared libraries.
       'component%': 'static_library',
     },
     # These come from the above variable scope.
     'target_arch%': '<(target_arch)',
     'sysroot%': '<(sysroot)',
     'nacl_standalone%': '<(nacl_standalone)',
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'component%': '<(component)',
-    'goma_status%': '<(goma_status)',
-    'gomadir%': '<(gomadir)',
 
     'nacl_strict_warnings%': 1,
     'nacl_validator_ragel%': 1,
 
     'linux2%': 0,
       'conditions': [
         ['OS=="win"', {
           'python_exe': [
             'call <(DEPTH)/native_client/tools/win_py.cmd'
           ],
@@ skipping 640 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',
   ],
 }