Index: gyp/pathops_unittest.gyp |
diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp |
index 9803db93823c7934ea78cb6f589c8c99c2a1d1c1..190b4f3816a1f282fc95f7bd5f804509a0449e3f 100644 |
--- a/gyp/pathops_unittest.gyp |
+++ b/gyp/pathops_unittest.gyp |
@@ -1,4 +1,4 @@ |
-# GYP file to build unit tests. |
+# GYP file to build pathops unit tests. |
{ |
'includes': [ |
'apptype_console.gypi', |
@@ -7,34 +7,28 @@ |
{ |
'target_name': 'pathops_unittest', |
'type': 'executable', |
- 'suppress_wildcard': '1', |
- 'include_dirs' : [ |
- '../src/core', |
- '../src/effects', |
- '../src/lazy', |
- '../src/pathops', |
- '../src/pdf', |
- '../src/pipe/utils', |
- '../src/utils', |
- ], |
'includes': [ |
'pathops_unittest.gypi', |
], |
+ 'dependencies': [ 'tools.gyp:crash_handler' ], |
'sources': [ |
'../tests/PathOpsAngleIdeas.cpp', |
'../tests/PathOpsCubicLineIntersectionIdeas.cpp', |
'../tests/PathOpsDebug.cpp', |
'../tests/PathOpsOpLoopThreadedTest.cpp', |
'../tests/PathOpsSkpClipTest.cpp', |
- '../tests/Test.cpp', |
- '../tests/Test.h', |
'../tests/skia_test.cpp', |
], |
- 'dependencies': [ |
- 'flags.gyp:flags', |
- 'skia_lib.gyp:skia_lib', |
- ], |
'conditions': [ |
+ [ 'skia_android_framework == 1', { |
+ 'libraries': [ |
+ '-lskia', |
+ ], |
+ 'libraries!': [ |
+ '-lz', |
+ '-llog', |
+ ], |
+ }], |
[ 'skia_gpu == 1', { |
'include_dirs': [ |
'../src/gpu', |