| Index: gyp/common_conditions.gypi
|
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
|
| index f3caddccfedc77b5fc83fd44d4f158ba7710a507..f8100146d5bed962fda5328762d7ee20e0fd7719 100644
|
| --- a/gyp/common_conditions.gypi
|
| +++ b/gyp/common_conditions.gypi
|
| @@ -193,6 +193,28 @@
|
| },
|
| ],
|
|
|
| + ['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',
|
| + ],
|
| + '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',
|
| + ],
|
| + }],
|
|
|
| [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
|
| {
|
| @@ -428,18 +450,28 @@
|
| 'SK_BUILD_FOR_ANDROID',
|
| 'SK_FONTHOST_DOES_NOT_USE_FONTMGR',
|
| ],
|
| - 'configurations': {
|
| - 'Debug': {
|
| - 'cflags': ['-g']
|
| - },
|
| - 'Release': {
|
| - 'cflags': ['-O2'],
|
| - 'defines': [ 'NDEBUG' ],
|
| - },
|
| - },
|
| + 'conditions': [
|
| + [ 'skia_android_framework==0', {
|
| + # Don't use the configurations for skia_android_framework, where
|
| + # we generate a single makefile for all builds, and flags can be
|
| + # set manually for debugging.
|
| + 'configurations': {
|
| + 'Debug': {
|
| + 'cflags': ['-g']
|
| + },
|
| + 'Release': {
|
| + 'cflags': ['-O2'],
|
| + 'defines': [ 'NDEBUG' ],
|
| + },
|
| + },
|
| + # Adding these libraries is not necessary for the framework.
|
| + 'libraries': [
|
| + '-lstdc++',
|
| + '-lm',
|
| + ],
|
| + }],
|
| + ],
|
| 'libraries': [
|
| - '-lstdc++',
|
| - '-lm',
|
| '-llog',
|
| ],
|
| 'cflags': [
|
|
|