AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

link libwebpmux in system-webp builds

Browse Source 
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>
This commit is contained in:
Mike Klein 2017-08-01 10:07:25 -04:00 committed by Mike Klein
parent 7294b851d2
commit 7516c2775c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
third_party/libwebp/BUILD.gn vendored
View File

@ -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" ]