commit 2cb8f8581df129923b18b2deb70caab870ce0269
author Lei Zhang <thestig@chromium.org> Mon Sep 16 19:39:16 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Sep 16 19:39:16 2019 +0000
tree eaf3324c8c8e61414c2ffb70cfb857e86e0946e9
parent 41a17ffb7281c2ad27c0da114bdf9476a452ae40

Change pdfium_test to show Skia build option.

When Skia is enabled, pdfium_test --show-config will print "SKIA" and
when Skia Paths is enabled, it will print "SKIAPATHS".

This will be used by the test runner code to selectively disable tests
when Skia / Skia Paths is enabled.

Bug: pdfium:11
Change-Id: Id28af8a35bfd28cb1a39f4ce74b24853dc011ff1
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60692
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

samples/BUILD.gn

diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index bfa34fa..5b90f60 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -22,6 +22,8 @@
   include_dirs = [ ".." ]
   if (pdf_use_skia) {
     defines += [ "PDF_ENABLE_SKIA" ]
+  } else if (pdf_use_skia_paths) {
+    defines += [ "PDF_ENABLE_SKIA_PATHS" ]
   }
   if (is_asan) {
     defines += [ "PDF_ENABLE_ASAN" ]

samples/pdfium_test.cc

diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index e4ba85f..83c5742 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -18,6 +18,10 @@
 #define _SKIA_SUPPORT_
 #endif
 
+#if defined PDF_ENABLE_SKIA_PATHS && !defined _SKIA_SUPPORT_PATHS_
+#define _SKIA_SUPPORT_PATHS_
+#endif
+
 #include "public/cpp/fpdf_scopers.h"
 #include "public/fpdf_annot.h"
 #include "public/fpdf_attachment.h"
@@ -910,6 +914,15 @@
   config.append("ASAN");
   maybe_comma = ",";
 #endif  // PDF_ENABLE_ASAN
+#if defined(PDF_ENABLE_SKIA)
+  config.append(maybe_comma);
+  config.append("SKIA");
+  maybe_comma = ",";
+#elif defined(PDF_ENABLE_SKIA_PATHS)
+  config.append(maybe_comma);
+  config.append("SKIAPATHS");
+  maybe_comma = ",";
+#endif
   printf("%s\n", config.c_str());
 }