commit e2b9037c4031b7f7c7c8f4689039f4375b9d6e0a
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 11 18:46:30 2013 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 11 18:46:30 2013 +0000
tree d9d1398d40eb7a303232d2a2382423f9e74992aa
parent fa05719ce21a97e07567a9355eaed5c780ba5c09

Disable soft floating point on ChromeOS

Should fix the Daisy build.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/18812006

git-svn-id: http://skia.googlecode.com/svn/trunk@10020 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index fe54bf3..2faf67d 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -150,7 +150,6 @@
             ],
             'cflags': [
               '-march=armv7-a',
-              '-mfloat-abi=softfp',
             ],
             'conditions': [
               [ 'arm_neon == 1', {
@@ -170,6 +169,11 @@
                   '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
                 ],
               }],
+              [ 'skia_os != "chromeos"', {
+                'cflags': [
+                  '-mfloat-abi=softfp',
+                ],
+              }],
             ],
           }],
         ],