diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-08-01 10:07:25 -0400 |
|---|---|---|
| committer |  Mike Klein <mtklein@google.com> | 2017-08-01 14:33:38 +0000 |
| commit | 7516c2775c30d04a8d2c467f18d3289d78c2b841 (patch) | |
| tree | 156f3b098601d56f76d90737a0f16d07a0c4024a /third_party/libwebp | |
| parent | 7294b851d277d8e703b23657e1a990f1ae24ead6 (diff) | |
link libwebpmux in system-webp builds
We use several symbols from this library... we currently fail to link.
(The other small changes in here are automatic from gn format.)
BUG=skia:6891
Change-Id: Iec6f5deceecdb61571827ebb502a9f7e7e4a4bef
Reviewed-on: https://skia-review.googlesource.com/29260
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
Diffstat (limited to 'third_party/libwebp')
| -rw-r--r-- | third_party/libwebp/BUILD.gn | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn index 4ac2c5ef5c..46acfc89e8 100644 --- a/third_party/libwebp/BUILD.gn +++ b/third_party/libwebp/BUILD.gn @@ -14,6 +14,7 @@ if (skia_use_system_libwebp) { libs = [ "webp", "webpdemux", + "webpmux", ] } } else { @@ -38,7 +39,7 @@ if (skia_use_system_libwebp) { ] if ((current_cpu == "x86" || current_cpu == "x64") && (!is_win || is_clang)) { - cflags_c = ["-msse4.1"] + cflags_c = [ "-msse4.1" ] } } @@ -50,7 +51,7 @@ if (skia_use_system_libwebp) { ] if ((current_cpu == "x86" || current_cpu == "x64") && (!is_win || is_clang)) { - cflags_c = ["-mavx2"] + cflags_c = [ "-mavx2" ] } } @@ -58,13 +59,11 @@ if (skia_use_system_libwebp) { public_include_dirs = [ "../externals/libwebp/src" ] deps = [ - ":libwebp_sse41", ":libwebp_avx2", + ":libwebp_sse41", ] if (is_android) { - deps += [ - "//third_party/cpu-features", - ] + deps += [ "//third_party/cpu-features" ] } configs += [ ":libwebp_defines" ] |