AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable qcms on build for Android framework

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2160863003

Review-Url: https://codereview.chromium.org/2160863003
This commit is contained in:
msarett 2016-07-19 11:17:55 -07:00 committed by Commit bot
parent 7f119caecb
commit ff1740394e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gyp/common_conditions.gypi
View File

@ -19,9 +19,6 @@
'SK_HAS_JPEG_LIBRARY',
'SK_HAS_PNG_LIBRARY',
'SK_HAS_WEBP_LIBRARY',
# Temporarily test against the QCMS library.
'SK_TEST_QCMS',
],
'conditions' : [
[ 'skia_is_bot', {
@ -32,6 +29,12 @@
'SK_CODEC_DECODES_RAW',
],
}],
[ 'skia_android_framework == 0', {
'defines': [
# Temporarily test against the QCMS library.
'SK_TEST_QCMS',
],
}],
['skia_pic', {
'cflags': [
'-fPIC',

6
gyp/ports.gyp
View File

@ -12,9 +12,7 @@
'standalone_static_library': 1,
'dependencies': [
'core.gyp:*',
'qcms.gyp:qcms',
],
'export_dependent_settings': [ 'qcms.gyp:qcms', ],
'include_dirs': [
'../include/effects',
'../include/client/android',
@ -76,6 +74,10 @@
['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
],
'conditions': [
[ 'skia_android_framework == 0', {
'dependencies': [ 'qcms.gyp:qcms', ],
'export_dependent_settings': [ 'qcms.gyp:qcms', ],
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',