From 9fb27cb9797937499c9678bc74cf7846cbf5d2b8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:41:05 -0800 Subject: Fix relative includes within core/ R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . --- core/src/fxge/android/fpf_skiafont.h | 2 +- core/src/fxge/android/fpf_skiafontmgr.cpp | 3 ++- core/src/fxge/android/fpf_skiafontmgr.h | 2 +- core/src/fxge/android/fpf_skiamodule.h | 2 +- core/src/fxge/android/fx_fpf.h | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'core/src/fxge/android') diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 6ee2f258e4..c88f2407c1 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 7e7aee3c06..a263416521 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_ext.h" #include "fx_fpf.h" + #if _FX_OS_ == _FX_ANDROID_ #define FPF_SKIAMATCHWEIGHT_NAME1 62 #define FPF_SKIAMATCHWEIGHT_NAME2 60 diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 0b33627cf3..cd503f58a9 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h index 5d1da7be32..ff99eda75d 100644 --- a/core/src/fxge/android/fpf_skiamodule.h +++ b/core/src/fxge/android/fpf_skiamodule.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" class CFPF_SkiaFontMgr; diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h index a484c1e076..6096884ca9 100644 --- a/core/src/fxge/android/fx_fpf.h +++ b/core/src/fxge/android/fx_fpf.h @@ -7,9 +7,9 @@ #ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_ #define CORE_SRC_FXGE_ANDROID_FX_FPF_H_ -#include "../../../include/fxge/fpf.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fpf.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" #include "fx_android_font.h" #endif // CORE_SRC_FXGE_ANDROID_FX_FPF_H_ -- cgit v1.2.3