diff --git a/BUILD.gn b/BUILD.gn index bbf066a2f5ec..c7ab8f6fc125 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,7 +3,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("gn/flutter_defines.gni") import("gn/fuchsia_defines.gni") import("gn/shared_sources.gni") import("gn/skia.gni") @@ -39,9 +38,6 @@ config("skia_public") { if (is_fuchsia || is_linux) { defines += [ "SK_R32_SHIFT=16" ] } - if (skia_enable_flutter_defines) { - defines += flutter_defines - } if (skia_enable_optimize_size) { defines += [ "SK_ENABLE_OPTIMIZE_SIZE" ] } @@ -3422,14 +3418,13 @@ if (skia_enable_tools) { } } -if (is_ios && skia_use_metal && skia_enable_ganesh && - !skia_enable_flutter_defines) { +if (is_ios && skia_use_metal && skia_enable_ganesh) { group("minimal_ios_mtl_skia_app") { deps = [ "experimental/minimal_ios_mtl_skia_app" ] } } -if (is_ios && skia_enable_skottie && !skia_enable_flutter_defines) { +if (is_ios && skia_enable_skottie) { group("skottie_ios") { deps = [ "tools/skottie_ios_app" ] } diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni deleted file mode 100644 index 9da55be23081..000000000000 --- a/gn/flutter_defines.gni +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2017 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# NOTICE: Editing this file won't do anything! Flutter has forked our GN files, -# so the correct place to modify how Flutter builds Skia is at: -# https://github.com/flutter/engine/blob/main/skia/flutter_defines.gni - -flutter_defines = [ - # Flutter always wants this https://github.com/flutter/flutter/issues/11402 - "SK_ENABLE_DUMP_GPU", - - # Staging - "SK_LEGACY_IGNORE_DRAW_VERTICES_BLEND_WITH_NO_SHADER", - "SK_DISABLE_LEGACY_GRDIRECTCONTEXT_BOOLS", - "SK_DISABLE_LEGACY_GRDIRECTCONTEXT_FLUSH", - - # Fast low-precision software rendering isn't a priority for Flutter. - "SK_DISABLE_LEGACY_SHADERCONTEXT", - "SK_FORCE_RASTER_PIPELINE_BLITTER", - - # When running Metal, ensure that command buffers are scheduled before - # returning from submit. - "SK_METAL_WAIT_UNTIL_SCHEDULED", -] - -if (!is_fuchsia) { - flutter_defines += [ "SK_DISABLE_EFFECT_DESERIALIZATION" ] -} diff --git a/gn/skia.gni b/gn/skia.gni index a9e5e2ee3b45..f23a90d52b08 100644 --- a/gn/skia.gni +++ b/gn/skia.gni @@ -16,7 +16,6 @@ declare_args() { skia_enable_api_available_macro = true skia_enable_android_utils = is_skia_dev_build skia_enable_discrete_gpu = true - skia_enable_flutter_defines = false skia_enable_fontmgr_empty = false skia_enable_fontmgr_fuchsia = is_fuchsia skia_enable_fontmgr_win = is_win