Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: BUILD.gn

Issue 2413983004: Move fxge/android to if(is_android) on build (Closed)
Patch Set: Wrong skia file Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | core/fxge/android/fpf_skiafont.h » ('j') | core/fxge/android/fpf_skiafont.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index f87201cc57ed62e03d770543b1158f96c8e26934..e6fcb55497aa96757e54ec4a6d0ffda2d346b69d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -746,15 +746,6 @@ static_library("fxcrt") {
static_library("fxge") {
sources = [
- "core/fxge/android/fpf_skiafont.cpp",
- "core/fxge/android/fpf_skiafont.h",
- "core/fxge/android/fpf_skiafontmgr.cpp",
- "core/fxge/android/fpf_skiafontmgr.h",
- "core/fxge/android/fpf_skiamodule.cpp",
- "core/fxge/android/fpf_skiamodule.h",
- "core/fxge/android/fx_android_font.cpp",
- "core/fxge/android/fx_android_font.h",
- "core/fxge/android/fx_android_imp.cpp",
"core/fxge/apple/apple_int.h",
"core/fxge/apple/cfx_quartzdevice.h",
"core/fxge/apple/fx_mac_imp.cpp",
@@ -867,6 +858,20 @@ static_library("fxge") {
]
configs -= [ "//build/config/win:lean_and_mean" ]
}
+
+ if (is_android) {
Lei Zhang 2016/10/14 19:46:05 I don't think this is necessary. I believe some de
npm 2016/10/17 15:02:25 I do not
+ sources += [
+ "core/fxge/android/fpf_skiafont.cpp",
+ "core/fxge/android/fpf_skiafont.h",
+ "core/fxge/android/fpf_skiafontmgr.cpp",
+ "core/fxge/android/fpf_skiafontmgr.h",
+ "core/fxge/android/fpf_skiamodule.cpp",
+ "core/fxge/android/fpf_skiamodule.h",
+ "core/fxge/android/fx_android_font.cpp",
+ "core/fxge/android/fx_android_font.h",
+ "core/fxge/android/fx_android_imp.cpp",
+ ]
+ }
}
static_library("fxedit") {
« no previous file with comments | « no previous file | core/fxge/android/fpf_skiafont.h » ('j') | core/fxge/android/fpf_skiafont.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698