diff options
| author |  djsollen <djsollen@google.com> | 2016-02-16 09:19:35 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-16 09:19:36 -0800 |
| commit | e71dc3fd0d7e8a9ff8ffbb56c5c2a9daeed9df49 (patch) | |
| tree | b18a69792e0dcb9a8c1cf484d04960b90be3a02f /gyp | |
| parent | afec27f13b28d900232cb1825c63cab2d6e4e103 (diff) | |
Use a statically linked libhwui for testing.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1688383005
Review URL: https://codereview.chromium.org/1688383005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/dm.gyp | 5 | ||||
| -rw-r--r-- | gyp/tests.gypi | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/gyp/dm.gyp b/gyp/dm.gyp index 831cde7e04..a8a7fd7cae 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -16,10 +16,7 @@ ['skia_android_framework', { 'libraries': [ 'skia_static.a', - '-lhwui', - ], - 'include_dirs': [ - '../../../frameworks/base/libs/hwui/', + 'hwui_static.a', ], 'sources': [ '../dm/DMSrcSinkAndroid.cpp', diff --git a/gyp/tests.gypi b/gyp/tests.gypi index 09050ad1c9..dfce3c0849 100644 --- a/gyp/tests.gypi +++ b/gyp/tests.gypi @@ -32,11 +32,6 @@ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', { 'sources!': [ '../tests/FontMgrAndroidParserTest.cpp', ], }], - [ 'skia_android_framework == 1', { - 'libraries': [ - '-ldl', - ], - }], [ 'not skia_pdf', { 'dependencies!': [ 'pdf.gyp:pdf', 'zlib.gyp:zlib' ], 'dependencies': [ 'pdf.gyp:nopdf' ], |