diff --git a/runtime/test_font_data.cc b/runtime/test_font_data.cc index 462b1440258aa..3dbe58f2548bd 100644 --- a/runtime/test_font_data.cc +++ b/runtime/test_font_data.cc @@ -1621,19 +1621,10 @@ namespace flutter { std::vector> GetTestFontData() { std::vector> typefaces; #if EMBED_TEST_FONT_DATA - const bool defaultsToAhem = - std::getenv("FLUTTER_ROOT") && !std::getenv("USE_FLUTTER_TEST_FONT"); - if (defaultsToAhem) { - typefaces.push_back(SkTypeface::MakeFromStream( - SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength))); - typefaces.push_back(SkTypeface::MakeFromStream( - SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength))); - } else { - typefaces.push_back(SkTypeface::MakeFromStream( - SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength))); - typefaces.push_back(SkTypeface::MakeFromStream( - SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength))); - } + typefaces.push_back(SkTypeface::MakeFromStream( + SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength))); + typefaces.push_back(SkTypeface::MakeFromStream( + SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength))); typefaces.push_back(SkTypeface::MakeFromStream( SkMemoryStream::MakeDirect(kCoughFont, kCoughFontLength))); #endif // EMBED_TEST_FONT_DATA @@ -1643,13 +1634,7 @@ std::vector> GetTestFontData() { std::vector GetTestFontFamilyNames() { std::vector names; #if EMBED_TEST_FONT_DATA - const bool defaultsToAhem = - std::getenv("FLUTTER_ROOT") && !std::getenv("USE_FLUTTER_TEST_FONT"); - if (defaultsToAhem) { - names = {"Ahem", "FlutterTest", "Cough"}; - } else { - names = {"FlutterTest", "Ahem", "Cough"}; - } + names = {"FlutterTest", "Ahem", "Cough"}; #endif // EMBED_TEST_FONT_DATA return names; }