From 88a7ac0b2dad4e7d581eae2da19888aec9ba1693 Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 14 Sep 2016 11:16:49 -0700 Subject: GN: add is_official_build ... and use it to control debug symbols and SK_ALLOW_STATIC_GLOBAL_INITIALIZERS. This will most directly have the effect of disabling GLProgramsTest and a bunch of similar failing Vk tests on Android. Hopefully this makes the N7 trybot go green, keeping the N5 trybot green. Just running the N10 for fun. (is_official_build is how Chrome terms this sort of ReleaseForReal build.) BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340723003 Review-Url: https://codereview.chromium.org/2340723003 --- gn/BUILDCONFIG.gn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gn/BUILDCONFIG.gn') diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index e6a8b695ff..79d06f400b 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -6,12 +6,17 @@ # It's best to keep the names and defaults of is_foo flags consistent with Chrome. declare_args() { - is_debug = true + is_official_build = false is_component_build = false ndk = "" ndk_api = 0 # 0 == picked automatically for target_cpu. sanitize = "" } +declare_args() { + is_debug = !is_official_build +} + +assert(!(is_debug && is_official_build)) # Platform detection if (target_os == "") { @@ -115,6 +120,9 @@ default_configs = [ if (!is_debug) { default_configs += [ "//gn:release" ] } +if (!is_official_build) { + default_configs += [ "//gn:debug_symbols" ] +} set_defaults("executable") { configs = default_configs + [ "//gn:executable" ] -- cgit v1.2.3