diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 13:24:46 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 13:24:46 +0000 |
| commit | c8b326f1344b06e84f95ff81b238772078469cdf (patch) | |
| tree | b9a07745c0d7239a93c1423fa7c6f5edf2acdac1 /skia/skia.gyp | |
| parent | d2e72982e075c7e253892338ca4deca6ecb97413 (diff) | |
| download | chromium_src-c8b326f1344b06e84f95ff81b238772078469cdf.zip chromium_src-c8b326f1344b06e84f95ff81b238772078469cdf.tar.gz chromium_src-c8b326f1344b06e84f95ff81b238772078469cdf.tar.bz2 | |
Build certain Skia files targetted for Linux when building on Android
BUG=
TEST=
Review URL: http://codereview.chromium.org/9131001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index e6d65d3..1024d66 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -796,7 +796,8 @@ 'ext/SkFontHost_fontconfig.cpp', 'ext/SkFontHost_fontconfig_direct.cpp', ], - }, { # use_glib == 0 + }], + [ 'use_glib == 0 and OS != "android"', { 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', @@ -805,6 +806,13 @@ '../third_party/skia/src/ports/SkFontHost_tables.cpp', ], }], + [ 'OS == "android"', { + 'sources/': [ + ['exclude', '_linux\\.(cc|cpp)$'], + ['include', 'ext/platform_device_linux\\.cc$'], + ['include', 'ext/platform_canvas_linux\\.cc$'], + ], + }], [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gdk', @@ -1045,7 +1053,12 @@ }], ], # The assembly uses the frame pointer register (r7 in Thumb/r11 in - # ARM), the compiler doesn't like that. + # ARM), the compiler doesn't like that. Explicitly remove the + # -fno-omit-frame-pointer flag for Android, as that gets added to all + # targets via common.gypi. + 'cflags!': [ + '-fno-omit-frame-pointer', + ], 'cflags': [ '-fomit-frame-pointer', ], |