summaryrefslogtreecommitdiff
path: root/skia
diff options
context:
space:
mode:
authordan sinclair <dsinclair@chromium.org>2017-04-10 10:47:18 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-10 16:51:05 +0000
commitecc3c836cf6965fbb7ad06b61da87332e59ea5d8 (patch)
tree9058e0ccbb70e51917c42cceb5f681b2168132d9 /skia
parentec8ff7d258ef25f7e3193572aeef220ff86784f0 (diff)
downloadpdfium-ecc3c836cf6965fbb7ad06b61da87332e59ea5d8.tar.xz
Fix windows skia component build
The skia build on Windows is not producing a shared .lib file when building skia. This Cl updates the Skia component build to correctly generate the needed shared library. Bug: pdfium:701 Change-Id: I9545b8fcf76c8622624780ee3cc9ba794f4a842d Reviewed-on: https://pdfium-review.googlesource.com/3971 Reviewed-by: Cary Clark <caryclark@google.com> Reviewed-by: Wei Li <weili@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'skia')
-rw-r--r--skia/BUILD.gn15
1 files changed, 15 insertions, 0 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index ef3a9edc5d..31a851d576 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -37,6 +37,17 @@ config("skia_config") {
defines = []
+ if (is_win) {
+ defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
+ }
+
+ if (is_component_build) {
+ defines += [
+ "SKIA_DLL",
+ "GR_GL_IGNORE_ES3_MSAA=0",
+ ]
+ }
+
if (skia_support_gpu) {
include_dirs += [
"//third_party/skia/include/gpu",
@@ -90,6 +101,10 @@ config("skia_library_config") {
defines = []
+ if (is_component_build) {
+ defines += [ "SKIA_IMPLEMENTATION=1" ]
+ }
+
if (current_cpu == "arm") {
if (arm_use_neon) {
defines += [ "SK_ARM_HAS_NEON" ]