Revert of Fix gn gn --check complaints about fxcrt. (patchset #1 id:1 of https://codereview.chromium.org/2289263005/ )
Reason for revert:
Breaking non-standalone builds.
Original issue's description:
> Fix gn gn --check complaints about fxcrt.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/6f9ae19b9b125af868077f4eee80a13e0c29c61e
TBR=dpranke@chromium.org,dsinclair@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2301783002
diff --git a/BUILD.gn b/BUILD.gn
index 6e702ab..b2f16b3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -142,9 +142,6 @@
"third_party:pdfium_base",
]
- public_deps = [
- ":fxcrt",
- ]
if (pdf_enable_xfa) {
sources += [
"fpdfsdk/cpdfsdk_xfawidget.cpp",
@@ -222,9 +219,6 @@
"core/fdrm/crypto/include/fx_crypt.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("fpdfdoc") {
@@ -316,9 +310,6 @@
"core/fpdfdoc/tagged_int.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("fpdfapi") {
@@ -548,9 +539,6 @@
"core/fpdfapi/include/cpdf_pagerendercontext.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("fpdftext") {
@@ -565,12 +553,17 @@
"core/fpdftext/unicodenormalizationdata.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("fxcodec") {
+ deps = [
+ "third_party:fx_lcms2",
+ "third_party:fx_libopenjpeg",
+ "third_party:fx_zlib",
+
+ # This is a generic JPEG library dependency.
+ "//third_party:jpeg",
+ ]
sources = [
"core/fxcodec/codec/ccodec_basicmodule.h",
"core/fxcodec/codec/ccodec_faxmodule.h",
@@ -631,18 +624,7 @@
"core/fxcodec/jbig2/JBig2_TrdProc.cpp",
"core/fxcodec/jbig2/JBig2_TrdProc.h",
]
- configs += [ ":pdfium_core_config" ]
include_dirs = []
- deps = [
- ":fxcrt",
- "third_party:fx_lcms2",
- "third_party:fx_libopenjpeg",
- "third_party:fx_zlib",
-
- # This is a generic JPEG library dependency.
- "//third_party:jpeg",
- ]
-
if (pdf_enable_xfa) {
sources += [
"core/fxcodec/codec/ccodec_bmpmodule.h",
@@ -670,6 +652,7 @@
# conversion to check that an address is 16-bit aligned (benign).
cflags_c = [ "-Wno-pointer-to-int-cast" ]
}
+ configs += [ ":pdfium_core_config" ]
}
config("fxge_warnings") {
@@ -725,13 +708,6 @@
"core/fxcrt/xml_int.h",
]
configs += [ ":pdfium_core_config" ]
- visibility += [ "//third_party:*" ]
- deps = [
- "//third_party:pdfium_base",
- ]
- public_deps = [
- "//third_party:pdfium_base",
- ]
if (pdf_enable_xfa) {
sources += [
@@ -831,10 +807,6 @@
":pdfium_core_config",
]
- deps = [
- ":fxcrt",
- ]
-
if (pdf_enable_xfa) {
sources += [
"core/fxge/ge/cfx_unicodeencodingex.cpp",
@@ -844,14 +816,18 @@
if (pdf_use_skia) {
sources += [ "core/fxge/skia/fx_skia_device.cpp" ]
- deps += [ "//skia" ]
+ deps = [
+ "//skia",
+ ]
} else {
sources += [
"core/fxge/agg/fx_agg_driver.cpp",
"core/fxge/agg/fx_agg_driver.h",
"core/fxge/apple/fx_apple_platform.cpp",
]
- deps += [ "third_party:fx_agg" ]
+ deps = [
+ "third_party:fx_agg",
+ ]
}
if (is_win) {
@@ -878,9 +854,6 @@
"fpdfsdk/fxedit/include/fxet_list.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("pdfwindow") {
@@ -911,9 +884,6 @@
"fpdfsdk/pdfwindow/PWL_Wnd.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
static_library("javascript") {
@@ -921,11 +891,6 @@
"fpdfsdk/javascript/ijs_context.h",
"fpdfsdk/javascript/ijs_runtime.h",
]
- configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
-
if (pdf_enable_v8) {
sources += [
"fpdfsdk/javascript/Annot.cpp",
@@ -972,11 +937,14 @@
"fpdfsdk/javascript/util.cpp",
"fpdfsdk/javascript/util.h",
]
- deps += [ ":fxjs" ]
+ deps = [
+ ":fxjs",
+ ]
configs += [ "//v8:external_startup_data" ]
} else {
sources += [ "fpdfsdk/javascript/JS_Runtime_Stub.cpp" ]
}
+ configs += [ ":pdfium_core_config" ]
}
static_library("formfiller") {
@@ -1001,9 +969,6 @@
"fpdfsdk/formfiller/cffl_textfield.h",
]
configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- ]
}
if (pdf_enable_v8) {
@@ -1012,20 +977,6 @@
"fxjs/fxjs_v8.cpp",
"fxjs/include/fxjs_v8.h",
]
- configs += [ ":pdfium_core_config" ]
- deps = [
- ":fxcrt",
- "//v8",
- "//v8:v8_libplatform",
- ]
- include_dirs = [
- "//v8",
- "//v8/include",
- ]
- public_deps = [
- "//v8",
- ]
-
if (pdf_enable_xfa) {
sources += [
"fxjs/cfxjse_arguments.cpp",
@@ -1043,6 +994,18 @@
"fxjs/include/fxjse.h",
]
}
+ deps = [
+ "//v8",
+ "//v8:v8_libplatform",
+ ]
+ configs += [ ":pdfium_core_config" ]
+ include_dirs = [
+ "//v8",
+ "//v8/include",
+ ]
+ public_deps = [
+ "//v8",
+ ]
}
}
@@ -1059,7 +1022,6 @@
"fpdfsdk/fpdfxfa/include/fpdfxfa_util.h",
]
deps = [
- ":fxcrt",
":xfa",
]
configs += [ ":pdfium_core_config" ]
@@ -1622,7 +1584,6 @@
]
include_dirs = [ "." ]
deps = [
- ":fxcrt",
":fxjs",
]
configs += [
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index a0db050..a3878e8 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -134,9 +134,6 @@
"agg23/agg_vcgen_dash.cpp",
"agg23/agg_vcgen_stroke.cpp",
]
- deps = [
- "//:fxcrt",
- ]
}
}
@@ -268,9 +265,6 @@
"libjpeg/makefile",
"libjpeg/transupp.h",
]
- deps = [
- "//:fxcrt",
- ]
}
config("fx_libopenjpeg_warnings") {