Move core/fdrm/crypto/include to core/fdrm/crypto
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2374413002
diff --git a/BUILD.gn b/BUILD.gn
index 2213530..a9c9d59 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -222,9 +222,9 @@
static_library("fdrm") {
sources = [
"core/fdrm/crypto/fx_crypt.cpp",
+ "core/fdrm/crypto/fx_crypt.h",
"core/fdrm/crypto/fx_crypt_aes.cpp",
"core/fdrm/crypto/fx_crypt_sha.cpp",
- "core/fdrm/crypto/include/fx_crypt.h",
]
configs += [ ":pdfium_core_config" ]
deps = [
diff --git a/core/fdrm/crypto/fx_crypt.cpp b/core/fdrm/crypto/fx_crypt.cpp
index ed7ede0..885b468 100644
--- a/core/fdrm/crypto/fx_crypt.cpp
+++ b/core/fdrm/crypto/fx_crypt.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fdrm/crypto/include/fx_crypt.h b/core/fdrm/crypto/fx_crypt.h
similarity index 95%
rename from core/fdrm/crypto/include/fx_crypt.h
rename to core/fdrm/crypto/fx_crypt.h
index 155def6..bb9f4a9 100644
--- a/core/fdrm/crypto/include/fx_crypt.h
+++ b/core/fdrm/crypto/fx_crypt.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
-#define CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
+#ifndef CORE_FDRM_CRYPTO_FX_CRYPT_H_
+#define CORE_FDRM_CRYPTO_FX_CRYPT_H_
#include "core/fxcrt/include/fx_system.h"
@@ -68,4 +68,4 @@
};
#endif
-#endif // CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
+#endif // CORE_FDRM_CRYPTO_FX_CRYPT_H_
diff --git a/core/fdrm/crypto/fx_crypt_aes.cpp b/core/fdrm/crypto/fx_crypt_aes.cpp
index 1a6eab4..27c064e 100644
--- a/core/fdrm/crypto/fx_crypt_aes.cpp
+++ b/core/fdrm/crypto/fx_crypt_aes.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fdrm/crypto/fx_crypt_sha.cpp b/core/fdrm/crypto/fx_crypt_sha.cpp
index 222ab9e..eb3373cf 100644
--- a/core/fdrm/crypto/fx_crypt_sha.cpp
+++ b/core/fdrm/crypto/fx_crypt_sha.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 192e094..bd217fc 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <set>
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.cpp b/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.cpp
index 6dfe918..3dbe7b9 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.cpp
@@ -8,7 +8,7 @@
#include <time.h>
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#include "core/fpdfapi/fpdf_parser/cpdf_security_handler.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_security_handler.cpp b/core/fpdfapi/fpdf_parser/cpdf_security_handler.cpp
index bf18028..2920d47 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_security_handler.cpp
@@ -8,7 +8,7 @@
#include <time.h>
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#include "core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
diff --git a/fpdfsdk/javascript/DEPS b/fpdfsdk/javascript/DEPS
index 5fb5728..1f6ae10 100644
--- a/fpdfsdk/javascript/DEPS
+++ b/fpdfsdk/javascript/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- '+core/fdrm/crypto/include',
+ '+core/fdrm/crypto',
'+core/fpdfapi/fpdf_font/include',
'+fxjs/include'
]
diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp
index eff7853..c07fe24 100644
--- a/fpdfsdk/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/javascript/JS_GlobalData.cpp
@@ -6,7 +6,7 @@
#include "fpdfsdk/javascript/JS_GlobalData.h"
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#include "third_party/base/stl_util.h"
#define JS_MAXGLOBALDATA (1024 * 4 - 8)
diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS
index 53c19d1..2f7428f 100644
--- a/xfa/fxfa/app/DEPS
+++ b/xfa/fxfa/app/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- '+core/fdrm/crypto/include',
+ '+core/fdrm/crypto',
'+core/fpdfapi/fpdf_font/include',
'+core/fpdfapi/fpdf_page/include',
'+core/fpdfapi/fpdf_parser/include',
diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index 419f15b..73f6c1e 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/include/xfa_checksum.h"
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
namespace {
