Revert "Add armv7s to the iOS ARCH list"

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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 5081 matching lines @@
             ['clang_xcode==1', {
               'WARNING_CFLAGS': [
                 '-Wno-unknown-warning-option',
               ],
             }],
 
             # Limit the valid architectures depending on "target_subarch".
             # This need to include the "arm" architectures but also the "x86"
             # ones (they are used when building for the simulator).
             ['target_subarch=="arm32"', {
-              'VALID_ARCHS': ['armv7', 'armv7s', 'i386'],
+              'VALID_ARCHS': ['armv7', 'i386'],
             }],
             ['target_subarch=="arm64"', {
               'VALID_ARCHS': ['arm64', 'x86_64'],
             }],
             ['target_subarch=="both"', {
-              'VALID_ARCHS': ['arm64', 'armv7', 'armv7s', 'x86_64', 'i386'],
+              'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'],
             }],
             ['use_system_libcxx==1', {
               'target_conditions': [
                 # Only use libc++ when building target for iOS not when building
                 # tools for the host (OS X) as Mac targets OS X SDK 10.6 which
                 # does not support libc++.
                 ['_toolset=="target"', {
                   'CLANG_CXX_LIBRARY': 'libc++',  # -stdlib=libc++
                 }]
               ],
@@ skipping 639 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # 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',
   },
 }