commit b38c6cf224558a92eb5f19d08f4d7a40311fad62
author Felix Kauselmann <licorn@gmail.com> Thu Feb 07 18:32:17 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 07 18:32:17 2019 +0000
tree 019dfbe92b4ecb968f75a70f99cc2f56c46e6e53
parent d05f479998e1317354b5f43ddcf2543a7b47b577

image_diff: respect use_system_zlib build argument

When building pdfium with a system provided copy of zlib we should build
image_diff the same way.

Change-Id: I5d1be6dcb09823c90085a1b33bb5c26b89243d8d
Reviewed-on: https://pdfium-review.googlesource.com/c/50030
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

testing/image_diff/BUILD.gn

diff --git a/testing/image_diff/BUILD.gn b/testing/image_diff/BUILD.gn
index 35c0d57..7d77723 100644
--- a/testing/image_diff/BUILD.gn
+++ b/testing/image_diff/BUILD.gn
@@ -15,6 +15,6 @@
   deps = [
     "../../third_party:pdfium_base",
     "../../third_party:png",
-    "//third_party/zlib",
+    "../../third_party:zlib",
   ]
 }

testing/image_diff/image_diff_png.cpp

diff --git a/testing/image_diff/image_diff_png.cpp b/testing/image_diff/image_diff_png.cpp
index 89c08f1..d2c9099 100644
--- a/testing/image_diff/image_diff_png.cpp
+++ b/testing/image_diff/image_diff_png.cpp
@@ -18,7 +18,12 @@
 
 #include "third_party/base/compiler_specific.h"
 #include "third_party/base/logging.h"
+
+#ifdef USE_SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "third_party/zlib/zlib.h"
+#endif
 
 #ifdef USE_SYSTEM_LIBPNG
 #include <png.h>