Skip to content

Commit 2b48a80

Browse files
committed
Fix up build/test issues when building on or off of mac (flutter#148)
1 parent 01e81ef commit 2b48a80

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

impeller/BUILD.gn

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ config("impeller_public_config") {
1818
}
1919

2020
if (is_win) {
21-
defines += [ "_USE_MATH_DEFINES" ]
21+
defines += [
22+
"_USE_MATH_DEFINES",
23+
# TODO(dnfield): https://github.com/flutter/flutter/issues/50053
24+
"_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING",
25+
]
2226
}
2327
}
2428

@@ -50,7 +54,6 @@ executable("impeller_unittests") {
5054
"base:base_unittests",
5155
"blobcat:blobcat_unittests",
5256
"compiler:compiler_unittests",
53-
"fixtures",
5457
"geometry:geometry_unittests",
5558

5659
# FML depends on the Dart VM for tracing and getting the current
@@ -63,6 +66,7 @@ executable("impeller_unittests") {
6366
"aiks:aiks_unittests",
6467
"display_list:display_list_unittests",
6568
"entity:entity_unittests",
69+
"fixtures",
6670
"image:image_unittests",
6771
"playground",
6872
"renderer:renderer_unittests",

impeller/compiler/utilities.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#include "impeller/compiler/utilities.h"
66

7+
#include <cctype>
78
#include <filesystem>
89
#include <sstream>
9-
#include <string>
1010

1111
namespace impeller {
1212
namespace compiler {

impeller/display_list/display_list_unittests.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ TEST_P(DisplayListTest, StrokedPathsDrawCorrectly) {
176176
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
177177
}
178178

179-
TEST_F(DisplayListTest, CanDrawWithMaskBlur) {
179+
TEST_P(DisplayListTest, CanDrawWithMaskBlur) {
180180
auto texture = CreateTextureForFixture("embarcadero.jpg");
181181
flutter::DisplayListBuilder builder;
182182

impeller/playground/playground.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ std::string PlaygroundBackendToString(PlaygroundBackend backend) {
3737
Playground::Playground()
3838
: impl_(PlaygroundImpl::Create(GetParam())),
3939
renderer_(impl_->CreateContext()),
40-
is_valid_(Playground::is_enabled() && renderer_.IsValid()) {}
40+
is_valid_(renderer_.IsValid()) {}
4141

4242
Playground::~Playground() = default;
4343

0 commit comments

Comments
 (0)