From 11e966a2dd931d4676a1b6a7d074a40dd4c1a5d1 Mon Sep 17 00:00:00 2001 From: npm Date: Mon, 17 Oct 2016 13:02:28 -0700 Subject: Move fxge/android to if(is_android) on build core/fxge/android files all have if _FX_OS_ == _FX_ANDROID_. Instead, put the files inside if (is_android) on Build.gn. Also, the skia file is already under if (pdf_use_skia), so the if defined(_SKIA_SUPPORT_) can be removed. Review-Url: https://codereview.chromium.org/2413983004 --- core/fxge/android/fpf_skiafontmgr.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'core/fxge/android/fpf_skiafontmgr.cpp') diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp index 3ecacd387c..3bd5cb42d1 100644 --- a/core/fxge/android/fpf_skiafontmgr.cpp +++ b/core/fxge/android/fpf_skiafontmgr.cpp @@ -6,8 +6,6 @@ #include "core/fxcrt/fx_system.h" -#if _FX_OS_ == _FX_ANDROID_ - #define FPF_SKIAMATCHWEIGHT_NAME1 62 #define FPF_SKIAMATCHWEIGHT_NAME2 60 #define FPF_SKIAMATCHWEIGHT_1 16 @@ -523,4 +521,3 @@ void CFPF_SkiaFontMgr::ReportFace(FXFT_Face face, } void CFPF_SkiaFontMgr::OutputSystemFonts() {} -#endif -- cgit v1.2.3