Remove pdf_use_cxx20_override.
Since the value set by pdf_use_cxx20_override is only ever used in
standalone PDFium, it does not make sense to provide a value for other
embedders to override.
Bug: pdfium:1932
Change-Id: Ia52d8a621eabe7809ff69a356c56a402c4f48109
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/102170
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: K. Moon <kmoon@chromium.org>
diff --git a/build_overrides/pdfium.gni b/build_overrides/pdfium.gni
index 85f15e6..b7dc9e0 100644
--- a/build_overrides/pdfium.gni
+++ b/build_overrides/pdfium.gni
@@ -17,10 +17,6 @@
# Default: Without XFA support.
pdf_enable_xfa_override = false
-# Build PDFium using C++20 if set to true. Otherwise builds with C++17.
-# Default: True for Windows component builds.
-pdf_use_cxx20_override = is_win && is_component_build
-
# Build PDFium with PartitionAlloc support, directing `fxcrt` to use
# it as its memory allocator in lieu of `malloc()`.
# Default: Use PartitionAlloc when building with Clang.
diff --git a/pdfium.gni b/pdfium.gni
index 72c42fe..a7271fc 100644
--- a/pdfium.gni
+++ b/pdfium.gni
@@ -36,8 +36,10 @@
# If XFA, also support tiff codec. Ignored if not XFA.
pdf_enable_xfa_tiff = true
- # Build PDFium with C++20.
- pdf_use_cxx20 = pdf_use_cxx20_override
+ # Build PDFium using C++20 if set to true. Otherwise builds with C++17.
+ # There is no "pdf_use_cxx20_override" variable because this is only used in
+ # standalone PDFium, and not when PDFium is embedded in our projects.
+ pdf_use_cxx20 = is_win && is_component_build
# Build PDFium with PartitionAlloc as the memory allocator.
pdf_use_partition_alloc = pdf_use_partition_alloc_override