diff options
| author | joel@chromium.org <joel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 06:21:29 +0000 |
|---|---|---|
| committer | joel@chromium.org <joel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 06:21:29 +0000 |
| commit | 77c1b2939c54c0c32ccf7b7a4848cbc433c5dbec (patch) | |
| tree | 17d2b769cfaa9c252a53ff5c706932581c37750e /skia/skia.gyp | |
| parent | 69b84b0867abf6f7c100533ff0db40f263c45278 (diff) | |
| download | chromium_src-77c1b2939c54c0c32ccf7b7a4848cbc433c5dbec.zip chromium_src-77c1b2939c54c0c32ccf7b7a4848cbc433c5dbec.tar.gz chromium_src-77c1b2939c54c0c32ccf7b7a4848cbc433c5dbec.tar.bz2 | |
arm: Add thumb target and associated fixes
Add arm_thumb=1 to GYP_DEFINES to enable
BUG=29203
Review URL: http://codereview.chromium.org/463027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 97dcd35..ab8d35e 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -576,16 +576,13 @@ [ 'OS != "win"', { 'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ], }], - [ 'target_arch == "arm" and armv7 == 1', { + [ 'armv7 == 1', { 'defines': [ '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], - 'cflags!': [ - # These files contain ARM assembly, and building with thumb breaks - # the assembler. - '-mthumb', - ], + }], + [ 'target_arch == "arm"', { 'sources!': [ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], |