From 278cdaeee91f18dc893bfdb89051814f2c37fd0b Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Fri, 18 May 2018 12:33:19 -0700 Subject: [PATCH] Remove unused defines and update buildroot. (#5307) --- DEPS | 2 +- common/config.gni | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/DEPS b/DEPS index a55da5ea0..3e30dc1fb 100644 --- a/DEPS +++ b/DEPS @@ -114,7 +114,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '78cf6d88d1a8b6f8293649508f2c1db6ad385fb0', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e2b647d54ab988569411517fac2e1aa28eeb4f46', # Fuchsia compatibility # diff --git a/common/config.gni b/common/config.gni index 0f5011302..0c2518784 100644 --- a/common/config.gni +++ b/common/config.gni @@ -11,9 +11,6 @@ if (target_cpu == "arm" || target_cpu == "arm64") { } declare_args() { - # Enable asserts, even in release builds. - flutter_asserts_always_on = false - # Enable ahead-of-time compilation on platforms where AOT is optional. flutter_aot = false @@ -39,21 +36,6 @@ if (flutter_runtime_mode == "debug") { feature_defines_list += [ "FLUTTER_RUNTIME_MODE=0" ] } -if (is_debug) { - # TODO(GYP) this should also be set when release_valgrind_build is set, - # but we don't have that flag in the GN build yet. - feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ] -} - -if (!is_mac) { - # Mac OS X has not implemented support for ENABLE(OPENTYPE_VERTICAL) yet. - feature_defines_list += [ "ENABLE_OPENTYPE_VERTICAL=1" ] -} - -if (flutter_asserts_always_on) { - feature_defines_list += [ "ENABLE_ASSERT=1" ] -} - if (flutter_aot) { feature_defines_list += [ "FLUTTER_AOT=1" ] }