From 8bd9ce00a0755d72c9b5b8ad43d8f50c2f51e5c5 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 9 Jun 2016 13:24:34 -0700
Subject: Move xfa/fxjse/ to fxjse/

This makes it clear that fxjse/ is a standalone component and should not be
entangled with other xfa/ components.

BUG=pdfium:506

Review-Url: https://codereview.chromium.org/2056663004
---
 BUILD.gn | 54 +++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

(limited to 'BUILD.gn')

diff --git a/BUILD.gn b/BUILD.gn
index 48bf0930ab..ec57d80d2f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -34,8 +34,8 @@ config("pdfium_common_config") {
 
 config("pdfium_core_config") {
   cflags = []
-  configs = [":pdfium_common_config"]
-  defines = ["V8_DEPRECATION_WARNINGS"]
+  configs = [ ":pdfium_common_config" ]
+  defines = [ "V8_DEPRECATION_WARNINGS" ]
   if (is_linux) {
     if (current_cpu == "x64") {
       defines += [ "_FX_CPU_=_FX_X64_" ]
@@ -893,6 +893,18 @@ if (pdf_enable_xfa) {
 
   static_library("xfa") {
     sources = [
+      "fxjse/class.cpp",
+      "fxjse/context.cpp",
+      "fxjse/context.h",
+      "fxjse/dynprop.cpp",
+      "fxjse/include/cfxjse_arguments.h",
+      "fxjse/include/cfxjse_class.h",
+      "fxjse/include/cfxjse_value.h",
+      "fxjse/include/fxjse.h",
+      "fxjse/runtime.cpp",
+      "fxjse/runtime.h",
+      "fxjse/scope_inline.h",
+      "fxjse/value.cpp",
       "xfa/fde/cfde_path.cpp",
       "xfa/fde/cfde_path.h",
       "xfa/fde/cfde_txtedtbuf.cpp",
@@ -1560,34 +1572,18 @@ if (pdf_enable_xfa) {
       "xfa/fxgraphics/cfx_shading.cpp",
       "xfa/fxgraphics/cfx_shading.h",
       "xfa/fxgraphics/include/cfx_graphics.h",
-      "xfa/fxjse/include/fxjse.h",
     ]
-    include_dirs = [ "." ]
-    if (pdf_enable_v8) {
-      sources += [
-        "xfa/fxjse/cfxjse_arguments.h",
-        "xfa/fxjse/class.cpp",
-        "xfa/fxjse/class.h",
-        "xfa/fxjse/context.cpp",
-        "xfa/fxjse/context.h",
-        "xfa/fxjse/dynprop.cpp",
-        "xfa/fxjse/runtime.cpp",
-        "xfa/fxjse/runtime.h",
-        "xfa/fxjse/scope_inline.h",
-        "xfa/fxjse/value.cpp",
-        "xfa/fxjse/value.h",
-      ]
-      include_dirs += [
-        "//v8",
-        "//v8/include",
-      ]
-      public_deps = [
-        "//v8",
-      ]
-      deps = [
-        "//v8:v8_libplatform",
-      ]
-    }
+    include_dirs = [
+      ".",
+      "//v8",
+      "//v8/include",
+    ]
+    public_deps = [
+      "//v8",
+    ]
+    deps = [
+      "//v8:v8_libplatform",
+    ]
     configs += [
       ":pdfium_core_config",
       ":xfa_warnings",
-- 
cgit v1.2.3