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

Unified Diff: gyp/tests.gypi

Issue 1228833003: Allow Android font manager on *nix. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove unintended whitespace. Created 5 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/ports.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/tests.gypi
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index ea332bf294eed180f45a939650b5fa9b3ca7999a..e2de6048ffed1685d039ae9d101f64c64e5e19cc 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -13,6 +13,7 @@
'../src/images',
'../src/pathops',
'../src/pdf',
+ '../src/ports',
'../src/pipe/utils',
'../src/utils',
'../src/utils/debugger',
@@ -31,13 +32,9 @@
'tools.gyp:sk_tool_utils',
],
'conditions': [
- [ 'skia_os == "android"',
- {
- 'include_dirs': [ '../src/ports', ],
- }, {
+ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
'sources!': [ '../tests/FontMgrAndroidParserTest.cpp', ],
- }
- ],
+ }],
[ 'skia_android_framework == 1', {
'libraries': [
'-ldl',
« no previous file with comments | « gyp/ports.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698