Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: gyp/ports.gyp

Issue 2160863003: Disable qcms on build for Android framework (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 430176e63ac42befe01c76074d608c71bf81f8ce..8080fe00560dae18e9c08c5a66d0859b0622e09c 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -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',
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698