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

Unified Diff: sky/engine/platform/BUILD.gn

Issue 1241673004: Minor sky/engine updates for Mac target (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove file added as a result of a bad merge Created 5 years, 5 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 | « sky/engine/core/script/monitor.h ('k') | sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/BUILD.gn
diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
index 8c6bef578e67c3b298e7ba83120e9580b5945abd..8b49d73f2ce77011a8144b27450597af213f4b8b 100644
--- a/sky/engine/platform/BUILD.gn
+++ b/sky/engine/platform/BUILD.gn
@@ -517,6 +517,10 @@ source_set("platform") {
"weborigin/SecurityPolicy.h",
]
+ if (is_ios || is_mac) {
+ sources += [ "fonts/apple/FontPlatformDataApple.cpp" ]
+ }
+
# Add in the generated files.
sources += get_target_outputs(":font_family_names") +
get_target_outputs(":runtime_enabled_features") +
@@ -577,10 +581,6 @@ source_set("platform") {
set_sources_assignment_filter(sources_assignment_filter)
}
- if (is_ios) {
- sources += [ "fonts/ios/FontPlatformDataIOS.cpp" ]
- }
-
if (is_linux) {
direct_dependent_configs = [ "//build/config/linux:fontconfig" ]
}
@@ -618,7 +618,6 @@ test("platform_unittests") {
"graphics/GraphicsContextTest.cpp",
"graphics/ThreadSafeDataTransportTest.cpp",
"image-decoders/ImageDecoderTest.cpp",
- "mac/ScrollElasticityControllerTest.mm",
"testing/RunAllTests.cpp",
"text/BidiResolverTest.cpp",
"text/SegmentedStringTest.cpp",
« no previous file with comments | « sky/engine/core/script/monitor.h ('k') | sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698