Updates to gyp files for building Android.mk

gyp/opts.gyp

 # Gyp file for opts projects
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
@@ skipping 96 matching lines @@
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
             '../src/opts/SkBlitRow_opts_none.cpp',
             '../src/opts/SkBlurImage_opts_none.cpp',
             '../src/opts/SkMorphology_opts_none.cpp',
             '../src/opts/SkUtils_opts_none.cpp',
             '../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
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
     # gcc to generate SSSE3 code.
     {
       'target_name': 'opts_ssse3',
       'product_name': 'skia_opts_ssse3',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'effects.gyp:*'
       ],
       'include_dirs': [
         '../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',
           ],
         }],
         # (Mac has -mssse3 globally.)
         [ 'skia_arch_type == "x86"', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
           ],
         }],
@@ skipping 15 matching lines @@
       'include_dirs': [
         '../src/core',
         '../src/opts',
       ],
       'cflags!': [
         '-fno-omit-frame-pointer',
         '-mfpu=vfp',  # remove them all, just in case.
         '-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',
         '-Wl,--fix-cortex-a8',
       ],
       'sources': [
         '../src/opts/memset16_neon.S',
         '../src/opts/memset32_neon.S',
         '../src/opts/SkBitmapProcState_arm_neon.cpp',
         '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
         '../src/opts/SkBitmapProcState_matrix_neon.h',
         '../src/opts/SkBlitMask_opts_arm_neon.cpp',
         '../src/opts/SkBlitRow_opts_arm_neon.cpp',
         '../src/opts/SkBlurImage_opts_neon.cpp',
         '../src/opts/SkMorphology_opts_neon.cpp',
         '../src/opts/SkXfermode_opts_arm_neon.cpp',
       ],
     },
   ],
 }