Updates to gyp files for building Android.mk

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 0d3b2e3d6aae9153f0796976790c536ea16f4f16..2fd0e95809e5bb07dc3467ecce203fe66e657d63 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -114,6 +114,14 @@
             '../src/opts/SkXfermode_opts_none.cpp',
           ],
         }],
+        [ 'skia_android_framework', {
+          'cflags!': [
+            '-msse2',

[djsollen, 2014/02/28 13:54:21]

is there any way to tell gyp to unset all the cflags so we don't have to keep a
master list?

[scroggo, 2014/02/28 14:17:21]

I don't know how to tell gyp that, but I could do it in my generator.

That said, we DO want some of them. I could hard code into Android.mk the ones
we want, but I think it makes more sense to put them in the gyp files for a
couple of reasons:

When we want the same flags for the framework as otherwise, it makes sense to
keep them in the gyp files.

If/when we transition to GN, it would be nice to be able to use our existing gyp
files (modified obviously, but with basically the same information).

It also means the generator can be more general and we keep the specifics in
gyp.

+            '-mfpu=neon',
+            '-fomit-frame-pointer',
+            '-mno-apcs-frame',
+          ]
+        }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
@@ -133,7 +141,8 @@
         '../src/core',
       ],
       'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', {
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
+           and not skia_android_framework', {
           'cflags': [
             '-mssse3',
           ],
@@ -169,9 +178,13 @@
         '-mfpu=vfpv3',
         '-mfpu=vfpv3-d16',
       ],
-      'cflags': [
-        '-mfpu=neon',
-        '-fomit-frame-pointer',
+      'conditions': [
+        [ 'not skia_android_framework', {
+          'cflags': [
+            '-mfpu=neon',
+            '-fomit-frame-pointer',
+          ],
+        }],
       ],
       'ldflags': [
         '-march=armv7-a',