commit 0cd76726afb0b013534e16e91ea6ad1b9bbe7d64
author Lei Zhang <thestig@chromium.org> Mon Nov 14 22:13:27 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 14 22:13:27 2022 +0000
tree 02ac8e7774c71bb4b7654d83aa8716ff613d6a3a
parent 5eda47dd4c3ce95c84188c042cf4823764a3e500

Give SkUserConfig.h a unique filename.

Rename SkUserConfig.h to SkPdfiumUserConfig.h, so Chromium checkouts
can avoid having 2 SkUserConfig.h files in the includes path.

Bug: chromium:1383982
Change-Id: I41d9b53875167f0613953491c4d11f65a9d782fc
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/101270
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

skia/BUILD.gn

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 93e2061..eb93a7a 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -23,7 +23,7 @@
 config("skia_config") {
   include_dirs = [ "//third_party/skia" ]
 
-  defines = [ "SK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\"" ]
+  defines = [ "SK_USER_CONFIG_HEADER=\"../../skia/config/SkPdfiumUserConfig.h\"" ]
 
   if (is_win) {
     defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
@@ -165,7 +165,7 @@
 component("skia") {
   sources = [
     # PDFium sources.
-    "config/SkUserConfig.h",
+    "config/SkPdfiumUserConfig.h",
     "ext/google_logging.cc",
   ]
 

skia/config/SkPdfiumUserConfig.h

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkPdfiumUserConfig.h
similarity index 100%
rename from skia/config/SkUserConfig.h
rename to skia/config/SkPdfiumUserConfig.h