summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-30 06:00:05 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-30 06:00:06 -0700
commit038bf0b129e56212a6de0989dca1ae023bb17c5d (patch)
treed6672ef18e62b26664242587bd661d4d21a0a153
parent5593bb8573c1deb1c649083d51963348adf972da (diff)
downloadpdfium-038bf0b129e56212a6de0989dca1ae023bb17c5d.tar.xz
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
-rw-r--r--BUILD.gn2
-rw-r--r--pdfium.gni (renamed from build_overrides/pdfium.gni)2
-rw-r--r--samples/BUILD.gn2
-rw-r--r--testing/libfuzzer/BUILD.gn2
-rw-r--r--third_party/BUILD.gn2
5 files changed, 5 insertions, 5 deletions
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/pdfium.gni
index d032aa12a4..b85ac74d0f 100644
--- a/build_overrides/pdfium.gni
+++ b/pdfium.gni
@@ -1,4 +1,4 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# 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.
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 = [