diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 16:07:39 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 16:07:39 +0000 |
| commit | e72a408359d766f143fc30d581f2682f17f81563 (patch) | |
| tree | 3c5e9a0ab03cd8f8bf747893c787aeba47ab6ecb | |
| parent | 842292f10fc08bc8701114f7eec00944b6ea26d2 (diff) | |
Updates to gyp files for building Android.mk
R=djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/180873012
git-svn-id: http://skia.googlecode.com/svn/trunk@13624 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/android_framework_lib.gyp | 1 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 7 | ||||
| -rw-r--r-- | gyp/opts.gyp | 21 |
3 files changed, 25 insertions, 4 deletions
diff --git a/gyp/android_framework_lib.gyp b/gyp/android_framework_lib.gyp index 2b05598898..da68530fad 100644 --- a/gyp/android_framework_lib.gyp +++ b/gyp/android_framework_lib.gyp @@ -14,6 +14,7 @@ 'opts.gyp:opts', 'pdf.gyp:pdf', 'ports.gyp:ports', + 'utils.gyp:utils', ], }, ], diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 3fa697e6e2..60376f7273 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -218,6 +218,13 @@ '-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=1', ], + 'cflags!': [ + '-g', + '-march=armv7-a', + '-mthumb', + '-mfpu=neon', + '-mfloat-abi=softfp', + ], 'defines': [ 'DCT_IFAST_SUPPORTED', # using freetype's embolden allows us to adjust fake bold settings at diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 0d3b2e3d6a..2fd0e95809 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -114,6 +114,14 @@ '../src/opts/SkXfermode_opts_none.cpp', ], }], + [ 'skia_android_framework', { + 'cflags!': [ + '-msse2', + '-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', |