From de44484f68f613d55aff22c01f8ed59e5cf07f0e Mon Sep 17 00:00:00 2001
From: "blundell@chromium.org"
 <blundell@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Mon, 5 Nov 2012 17:11:44 +0000
Subject: [PATCH] Changes to build/common.gypi for iOS.

- Disable some features that are not used on iOS.
- Remove dSYM in debug mode to reduce build time.
- Build for armv7 as armv7s is not yet fully tested.


Review URL: https://chromiumcodereview.appspot.com/11364072

git-svn-id: http://src.chromium.org/svn/trunk/src/build@165948 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/common.gypi b/common.gypi
index 8d3e18c5c..a66000155 100644
--- a/common.gypi
+++ b/common.gypi
@@ -472,10 +472,12 @@
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_printing%': 0,
+          'enable_session_service%': 0,
           'enable_themes%': 0,
           'enable_webrtc%': 0,
           'notifications%': 0,
           'remoting%': 0,
+          'safe_browsing%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
@@ -3283,6 +3285,12 @@
                   'STRIP_INSTALLED_PRODUCT': 'YES',
                 },
               },
+              'Debug_Base': {
+                'xcode_settings': {
+                  # Remove dSYM to reduce build time.
+                  'DEBUG_INFORMATION_FORMAT': 'dwarf',
+                },
+              },
             },
             'xcode_settings': {
               'conditions': [
@@ -3652,8 +3660,9 @@
         ],
       }],
       ['OS=="ios"', {
-        # Just build armv7 since iOS 4.3+ only supports armv7.
         'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
+        # Just build armv7, until armv7s is correctly tested.
+        'VALID_ARCHS': 'armv7 i386',
         'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
         # Target both iPhone and iPad.
         'TARGETED_DEVICE_FAMILY': '1,2',