diff options
| author |  djsollen <djsollen@google.com> | 2016-02-12 08:44:39 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-12 08:44:39 -0800 |
| commit | 2a8fcb4647115ce5e9b6127a716b6f50b2a9fd55 (patch) | |
| tree | 748613c25cf7fbe3af3a139b278358ac074f1411 /gyp | |
| parent | 6f96cf4bde38337724b492a00dd8e0857d84d5d6 (diff) | |
Update Android framework makefile to build static and shared libs
Also use static lib for testing tools and expose includes needed for
other framework testing tools to statically link in Skia.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1696483002
Review URL: https://codereview.chromium.org/1696483002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gyp | 4 | ||||
| -rw-r--r-- | gyp/dm.gyp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index 7c5d6df259..e9908b5860 100644 --- a/gyp/bench.gyp +++ b/gyp/bench.gyp @@ -31,10 +31,8 @@ 'conditions': [ ['skia_android_framework', { 'libraries': [ - '-lskia', - '-landroid', + 'skia_static.a', '-lhwui', - '-lutils', ], 'include_dirs': [ '../../../frameworks/base/libs/hwui/', diff --git a/gyp/dm.gyp b/gyp/dm.gyp index a05d079b8c..831cde7e04 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -15,10 +15,8 @@ 'conditions': [ ['skia_android_framework', { 'libraries': [ - '-lskia', - '-landroid', + 'skia_static.a', '-lhwui', - '-lutils', ], 'include_dirs': [ '../../../frameworks/base/libs/hwui/', |