From 038bf0b129e56212a6de0989dca1ae023bb17c5d Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Sat, 30 Apr 2016 06:00:05 -0700
Subject: Revert of Allow overriding GN build flags (patchset #2 id:20001 of
 https://codereview.chromium.org/1923333002/ )

Reason for revert:
Blocking the roll

Original issue's description:
> Allow overriding GN build flags
>
> In order to enable XFA from GN builds we need to be able to override
> pdf_enable_xfa. To do this a build_overrides/pdfium.gni file needs to be created
> in Chrome. To use that, we have to create a build_overrides/pdfium.gni file
> in PDFium that just uses the default values.
>
> BUG=chromium:62400
>
> Committed: https://pdfium.googlesource.com/pdfium/+/1ae572e7e35b52ce4897d1715c005a1b0f79526a

TBR=thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=chromium:62400

Review-Url: https://codereview.chromium.org/1941563002
---
 BUILD.gn                   |  2 +-
 build_overrides/pdfium.gni | 23 -----------------------
 pdfium.gni                 | 23 +++++++++++++++++++++++
 samples/BUILD.gn           |  2 +-
 testing/libfuzzer/BUILD.gn |  2 +-
 third_party/BUILD.gn       |  2 +-
 6 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 build_overrides/pdfium.gni
 create mode 100644 pdfium.gni

diff --git a/BUILD.gn b/BUILD.gn
index 86e0da32f7..8a96f21f46 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build_overrides/v8.gni")
-import("//build_overrides/pdfium.gni")
 import("//testing/test.gni")
+import("pdfium.gni")
 
 config("pdfium_config") {
   cflags = []
diff --git a/build_overrides/pdfium.gni b/build_overrides/pdfium.gni
deleted file mode 100644
index d032aa12a4..0000000000
--- a/build_overrides/pdfium.gni
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file contains PDFium-related build flags.
-
-declare_args() {
-  # On Android there's no system FreeType. On Windows and Mac, only a few
-  # methods are used from it.
-  pdfium_bundle_freetype = !is_linux
-
-  # Build PDFium either with or without v8 support.
-  pdf_enable_v8 = true
-
-  # Build PDFium either with or without XFA Forms support.
-  pdf_enable_xfa = false
-
-  # Build PDFium against skia (experimental) rather than agg.
-  pdf_use_skia = false
-
-  # Build PDFium standalone
-  pdf_is_standalone = false
-}
diff --git a/pdfium.gni b/pdfium.gni
new file mode 100644
index 0000000000..b85ac74d0f
--- /dev/null
+++ b/pdfium.gni
@@ -0,0 +1,23 @@
+# Copyright 2015 PDFium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file contains PDFium-related build flags.
+
+declare_args() {
+  # On Android there's no system FreeType. On Windows and Mac, only a few
+  # methods are used from it.
+  pdfium_bundle_freetype = !is_linux
+
+  # Build PDFium either with or without v8 support.
+  pdf_enable_v8 = true
+
+  # Build PDFium either with or without XFA Forms support.
+  pdf_enable_xfa = false
+
+  # Build PDFium against skia (experimental) rather than agg.
+  pdf_use_skia = false
+
+  # Build PDFium standalone
+  pdf_is_standalone = false
+}
diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index 3fdb97e3e2..c2d6eef7d2 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build_overrides/v8.gni")
-import("//build_overrides/pdfium.gni")
+import("../pdfium.gni")
 
 group("samples") {
   testonly = true
diff --git a/testing/libfuzzer/BUILD.gn b/testing/libfuzzer/BUILD.gn
index bd6215ba1a..0ee8b29e38 100644
--- a/testing/libfuzzer/BUILD.gn
+++ b/testing/libfuzzer/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/pdfium.gni")
+import("../../pdfium.gni")
 
 config("libfuzzer_config") {
   defines = [
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index eb1e53b3bb..e0c9bf116e 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/pdfium.gni")
+import("../pdfium.gni")
 
 group("third_party") {
   deps = [
-- 
cgit v1.2.3