Merge commit '04bb1f2f035343217875ce0fc19d3a7abde41717' into HEAD

Bug: 155031873
Change-Id: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227
Merged-In: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227
diff --git a/pdfium.gni b/pdfium.gni
index e48750e..00a3886 100644
--- a/pdfium.gni
+++ b/pdfium.gni
@@ -15,6 +15,9 @@
   #    //build/config/freetype.
   pdf_bundle_freetype = pdf_bundle_freetype_override
 
+  # Generate logging messages for click events that reach PDFium
+  pdf_enable_click_logging = false
+
   # Build PDFium either with or without v8 support.
   pdf_enable_v8 = pdf_enable_v8_override
 
@@ -53,15 +56,15 @@
   # Enable callgrind for performance profiling
   enable_callgrind = false
 
-  # Enable coverage information
-  use_coverage = false
-
   # Don't build against bundled zlib.
   use_system_zlib = false
 
   # Don't build against bundled lcms2.
   use_system_lcms2 = false
 
+  # Don't build against bundled libopenjpeg2.
+  use_system_libopenjpeg2 = false
+
   # Don't build against bundled libpng.
   use_system_libpng = false
 }
@@ -69,3 +72,6 @@
 if (pdf_use_skia && pdf_use_skia_paths) {
   assert(false, "Enable at most ONE of pdf_use_skia and pdf_use_skia_paths")
 }
+
+assert(!pdf_is_complete_lib || !is_component_build,
+       "pdf_is_complete_lib=true requires is_component_build=false")