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

Unified Diff: gyp/common_conditions.gypi

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 | « no previous file | gyp/ports.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index bc36e8a8cc0ceb29c309cf0baf99aefca79d6cbb..0b3e35863c4780c5971a482c066971fdd6a25a1b 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -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',
« no previous file with comments | « no previous file | gyp/ports.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698