diff options
| author | Stuart Morgan <stuartmorgan@chromium.org> | 2014-08-29 06:59:45 -0700 |
|---|---|---|
| committer | Stuart Morgan <stuartmorgan@chromium.org> | 2014-08-29 14:01:10 +0000 |
| commit | 7c31daaf4d36113ca2602d1887566a1ad5214a03 (patch) | |
| tree | 1004818a5acd9832df445a391e8bd4585f7757c7 /build | |
| parent | 4405bc45f47567c3f0e36c0ad18f9db192f86850 (diff) | |
| download | chromium_src-7c31daaf4d36113ca2602d1887566a1ad5214a03.zip chromium_src-7c31daaf4d36113ca2602d1887566a1ad5214a03.tar.gz chromium_src-7c31daaf4d36113ca2602d1887566a1ad5214a03.tar.bz2 | |
Revert "Add armv7s to the iOS ARCH list"
This reverts commit f1dc118635a18587a35b3d6f5092878467c261dd.
Reverting due to inconsistent behavior across toolchains, and lack of
clarity on whether armv7s is actually necessary.
BUG=407295,408027
R=rohitrao@chromium.org
Review URL: https://codereview.chromium.org/507423005
Cr-Commit-Position: refs/heads/master@{#292624}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5ccf1a4..0d1bea7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5089,13 +5089,13 @@ # 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': [ |