Index: gyp/common_conditions.gypi |
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
index f3caddccfedc77b5fc83fd44d4f158ba7710a507..58ae2dc42840a34337fbf09188768f5aafad522e 100644 |
--- a/gyp/common_conditions.gypi |
+++ b/gyp/common_conditions.gypi |
@@ -193,6 +193,61 @@ |
}, |
], |
+ ['skia_android_framework', { |
+ 'cflags': [ |
+ # Skia does not enforce this usage pattern so we disable it here to avoid |
+ # unecessary log spew when building |
+ '-Wno-unused-parameter', |
+ |
+ # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkString. |
+ # Revert to -D_FORTIFY_SOURCE=1 |
+ '-U_FORTIFY_SOURCE', |
+ '-D_FORTIFY_SOURCE=1', |
+ ], |
+ 'cflags!': [ |
djsollen
2014/01/22 21:02:44
If these are in our gyp files then I would prefer
scroggo
2014/01/22 23:52:41
Done.
|
+ '-fstrict-aliasing', |
+ '-Wall', |
+ '-Wno-c++11-extensions', |
+ '-fuse-ld=gold', |
+ '-fno-exceptions', |
+ '-fomit-frame-pointer', |
+ '-mno-apcs-frame', |
+ '-g', |
+ '-mthumb', |
+ '-march=armv7-a', |
+ '-mfpu=neon', |
+ '-mfloat-abi=softfp', |
+ '-msse2', |
+ # FIXME: Will this be needed for building SkBitmapProcState_opts_SSSE3.cpp? |
+ #'-mssse3', |
+ ], |
+ 'cflags_cc!': [ |
+ '-fno-rtti', |
+ ], |
+ 'defines': [ |
+ 'DCT_IFAST_SUPPORTED', |
+ # using freetype's embolden allows us to adjust fake bold settings at |
+ # draw-time, at which point we know which SkTypeface is being drawn |
+ 'SK_USE_FREETYPE_EMBOLDEN', |
+ # Android provides at least FreeType 2.4.0 at runtime. |
+ 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
+ # Skia should not use dlopen on Android. |
+ 'SK_CAN_USE_DLOPEN=0', |
+ ], |
+ 'defines!': [ |
+ # Don't hardcode these into the Android.mk |
+ 'SK_DEBUG', |
+ 'SK_DEVELOPER=1', |
+ ], |
+ 'libraries!': [ |
djsollen
2014/01/22 21:02:44
same here
scroggo
2014/01/22 23:52:41
Done.
|
+ '-lstdc++', |
+ '-lm', |
+ ], |
+ 'include_dirs!': [ |
djsollen
2014/01/22 21:02:44
and here
scroggo
2014/01/22 23:52:41
I think these are actually unneeded in general, so
|
+ 'config', |
+ 'ext', |
+ ], |
+ }], |
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', |
{ |