From 202ad7238489934ba0c64760de5f95782b36a213 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 29 Sep 2016 17:41:42 -0700
Subject: Move xfa/{fwl,fxbarcode,fxgraphics}/include up to parent

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2383583002
---
 fpdfsdk/DEPS                         | 4 ++--
 fpdfsdk/cpdfsdk_pageview.cpp         | 2 +-
 fpdfsdk/cpdfsdk_xfawidgethandler.cpp | 4 ++--
 fpdfsdk/fpdfxfa/DEPS                 | 4 ++--
 fpdfsdk/fpdfxfa/fpdfxfa_app.cpp      | 2 +-
 fpdfsdk/fpdfxfa/fpdfxfa_util.h       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'fpdfsdk')

diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 0fed7f3228..840666d996 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -11,7 +11,7 @@ include_rules = [
   '+core/fxge',
   '+public',
   '+v8',
-  '+xfa/fwl/core/include',
+  '+xfa/fwl/core',
   '+xfa/fxfa/include',
-  '+xfa/fxgraphics/include',
+  '+xfa/fxgraphics',
 ]
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 7f1cf76c90..0e4266774c 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -25,7 +25,7 @@
 #include "xfa/fxfa/include/xfa_ffpageview.h"
 #include "xfa/fxfa/include/xfa_ffwidgethandler.h"
 #include "xfa/fxfa/include/xfa_rendercontext.h"
-#include "xfa/fxgraphics/include/cfx_graphics.h"
+#include "xfa/fxgraphics/cfx_graphics.h"
 #endif  // PDF_ENABLE_XFA
 
 CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
index 11415c6e85..74a6a8e401 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
@@ -14,13 +14,13 @@
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_xfawidget.h"
 #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "xfa/fwl/core/include/fwl_widgethit.h"
+#include "xfa/fwl/core/fwl_widgethit.h"
 #include "xfa/fxfa/include/fxfa_basic.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
 #include "xfa/fxfa/include/xfa_ffpageview.h"
 #include "xfa/fxfa/include/xfa_ffwidget.h"
 #include "xfa/fxfa/include/xfa_ffwidgethandler.h"
-#include "xfa/fxgraphics/include/cfx_graphics.h"
+#include "xfa/fxgraphics/cfx_graphics.h"
 
 CPDFSDK_XFAWidgetHandler::CPDFSDK_XFAWidgetHandler(CPDFSDK_Environment* pEnv)
     : m_pEnv(pEnv) {}
diff --git a/fpdfsdk/fpdfxfa/DEPS b/fpdfsdk/fpdfxfa/DEPS
index b9a370408a..212c6ccf65 100644
--- a/fpdfsdk/fpdfxfa/DEPS
+++ b/fpdfsdk/fpdfxfa/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
-  '+xfa/fwl/core/include',
-  '+xfa/fxbarcode/include',
+  '+xfa/fwl/core',
+  '+xfa/fxbarcode',
 ]
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
index f26a95dff1..91dca08a86 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
@@ -11,7 +11,7 @@
 #include "fpdfsdk/cpdfsdk_environment.h"
 #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "xfa/fxbarcode/include/BC_Library.h"
+#include "xfa/fxbarcode/BC_Library.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
 #include "xfa/fxfa/include/xfa_fontmgr.h"
 
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/fpdfxfa_util.h
index 74f4f31d7c..a6b08a0d33 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "xfa/fwl/core/include/ifwl_adaptertimermgr.h"
+#include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 
 #define JS_STR_VIEWERTYPE_STANDARD L"Exchange"
 #define JS_STR_LANGUANGE L"ENU"
-- 
cgit v1.2.3