Revert 135087 - This patch is to enable x86 android build.

base/base.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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 668 matching lines @@
                 ['exclude', '^native_library_linux\\.cc$'],
                 ['exclude', '^process_util_linux\\.cc$'],
                 ['exclude', '^sys_info_linux\\.cc$'],
                 ['exclude', '^sys_string_conversions_linux\\.cc$'],
                 ['exclude', '^worker_pool_linux\\.cc$'],
               ],
             }],
           ],
         }],
         [ 'OS == "android" and _toolset == "target"', {
-          'conditions': [
-            ['target_arch == "ia32"', {
-              'sources/': [
-                ['include', '^atomicops_internals_x86_gcc\\.cc$'],
-              ],
-            }],
-          ],
           'dependencies': [
             'symbolize',
             '../third_party/ashmem/ashmem.gyp:ashmem',
             'base_java',
             'base_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/base',
           ],
           'link_settings': {
@@ skipping 229 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }