linux: roll deps for arm

Review URL: http://codereview.chromium.org/552063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37225 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 3 deletions

diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 765f7d2..55a6588 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -76,7 +76,7 @@
     'target_conditions': [
       ['OS=="mac"', {
           'xcode_settings': {
-            'MACOSX_DEPLOYMENT_TARGET': '10.4',
+            'MACOSX_DEPLOYMENT_TARGET': '10.5',
             # TODO(maf): figure out proper fix for the following.
             # There is only one place in plugin_mac.mm which attempts
             # to use ObjC exception handling.
@@ -132,7 +132,7 @@
             'UNICODE',
             'GTEST_NOT_MAC_FRAMEWORK_MODE',
             'NACL_OSX=1',
-            'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4',
+            'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5',
             'SK_BUILD_FOR_MAC',
           ],
           'configurations': {
@@ -146,7 +146,7 @@
             'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
             'OTHER_CFLAGS': [
                '-fno-eliminate-unused-debug-symbols',
-               '-mmacosx-version-min=10.4'],
+               '-mmacosx-version-min=10.5'],
             'WARNING_CFLAGS': ['-Wno-deprecated-declarations'],
             'WARNING_CXXFLAGS': ['-Wstrict-aliasing',
                                  '-Wno-deprecated',],
diff --git a/o3d/build/common_global.gypi b/o3d/build/common_global.gypi
index e3b5429..411b146 100644
--- a/o3d/build/common_global.gypi
+++ b/o3d/build/common_global.gypi
@@ -9,6 +9,13 @@
 # that generally in Chrome (so it can't be lumped into the top-level
 # build/common.gypi).
 {
+  'variables': {
+    'conditions': [
+      [ 'OS == "linux"', {
+        'use_system_zlib': 0,
+      }],
+    ],
+  },
   'target_defaults': {
     'conditions': [
       [ 'OS == "linux" and target_arch=="x64"', {
@@ -20,6 +27,16 @@
           '-m64',
         ],
       }],
+      [ 'OS == "mac"', {
+          'xcode_settings': {
+            'MACOSX_DEPLOYMENT_TARGET': '10.5',
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+            'OTHER_CFLAGS': ['-mmacosx-version-min=10.5'],
+          },
+          'defines': [
+            'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5',
+          ],
+      }],
     ],
   },
 }