From 3b71efc56e96009d8bfa80b1db2dc7da31bdca21 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Tue, 7 Apr 2015 16:23:32 +0200 Subject: [PATCH] Revert "Explicitly set target_subarch for iOS." This reverts commit f6b7265c6bd254b1558b8e04a2c6d2c1769ef4a6. Reason: Did not have the desired effect of resolving https://webrtc-codereview.appspot.com/50569004/ due to incorrect local testing. I suspect these lines need to be at another variables-level. TBR=tkchin@webrtc.org BUG=4503 Review URL: https://webrtc-codereview.appspot.com/47989004 Cr-Commit-Position: refs/heads/master@{#8939} --- webrtc/build/common.gypi | 8 -------- 1 file changed, 8 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 0a26f62bf..3c3a94dee 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -147,14 +147,6 @@ ['OS=="ios"', { 'build_libjpeg%': 0, 'enable_protobuf%': 0, - 'conditions': [ - ['target_arch=="arm"', { - 'target_subarch%': 'arm32', - }], - ['target_arch=="arm64"', { - 'target_subarch%': 'arm64', - }], - ], }], ['target_arch=="arm" or target_arch=="arm64"', { 'prefer_fixed_point%': 1,