Use gcc by default for gyp untrusted ARM builds

tools.gyp

 # 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.
 
 {
   ######################################################################
   'includes': [
     'build/common.gypi',
   ],
   ######################################################################
@@ skipping 17 matching lines @@
       ],
       'conditions': [
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'crt_init_32',
             'crt_fini_32',
             'crt_init_64',
             'crt_fini_64',
           ],
         }],
-        ['target_arch=="arm" and nacl_enable_arm_gcc!=0', {
+        ['target_arch=="arm"', {
           'dependencies': [
             'crt_init_arm',
             'crt_fini_arm',
           ]
         }],
       ],
     },
     {
       'target_name': 'untar_toolchains',
       'type': 'none',
@@ skipping 66 matching lines @@
                 '<(DEPTH)/native_client/build/untar_toolchain.py',
                 '--tool', 'x86_pnacl',
                 '--tmp', '<(SHARED_INTERMEDIATE_DIR)/untar',
                 '--sdk', '<(SHARED_INTERMEDIATE_DIR)/sdk',
                 '--os', '<(OS)',
                 '<(DEPTH)/native_client/toolchain/.tars/naclsdk_pnacl_<(OS)_x86.tgz',
               ],
             },
           ]
         }],
-        ['target_arch=="arm" and nacl_enable_arm_gcc!=0 and disable_arm==0 and disable_arm_untar==0', {
+        ['target_arch=="arm" and disable_arm==0 and disable_arm_untar==0', {
           'actions': [
             {
               'action_name': 'Untar arm toolchain',
               'msvs_cygwin_shell': 0,
               'description': 'Untar arm toolchain',
               'inputs': [
                  '<(DEPTH)/native_client/build/cygtar.py',
                  '<(DEPTH)/native_client/toolchain/.tars/gcc_arm.tgz',
                  '<(DEPTH)/native_client/toolchain/.tars/binutils_arm.tgz',
                  '<(DEPTH)/native_client/toolchain/.tars/newlib_arm.tgz',
@@ skipping 63 matching lines @@
               'outputs': ['<(glibc_dir)/stamp.prep'],
               'action': [
                 '>(python_exe)',
                 '<(DEPTH)/native_client/build/prep_nacl_sdk.py',
                 '--tool', 'x86_glibc',
                 '--path', '<(glibc_dir)',
               ],
             },
           ]
         }],
-        ['target_arch=="arm" and nacl_enable_arm_gcc!=0 and disable_arm==0', {
+        ['target_arch=="arm" and disable_arm==0', {
           'actions': [
             {
               'action_name': 'Prep arm toolchain',
               'msvs_cygwin_shell': 0,
               'description': 'Prep arm toolchain',
               'inputs': [
                  '<(arm_dir)/stamp.untar',
                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool arm_newlib)',
               ],
               'outputs': ['<(arm_dir)/stamp.prep'],
@@ skipping 139 matching lines @@
                 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/crtn.o',
             'objdir_newlib32':
                 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
           },
           'sources': [
             'src/untrusted/stubs/crtn_x86_32.S'
           ],
         }
       ],
     }],
-    ['target_arch=="arm" and nacl_enable_arm_gcc!=0', {
+    ['target_arch=="arm"', {
       'targets' : [
         {
           'target_name': 'crt_init_arm',
           'type': 'none',
           'dependencies': [
             'untar_toolchains',
             'prep_nacl_sdk'
           ],
           'variables': {
             'nlib_target': 'crt_init_dummy',
@@ skipping 37 matching lines @@
                 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
           },
           'sources': [
             'src/untrusted/stubs/crtn_arm.S'
           ],
         }
       ],
     }],
   ],
 }