commit b45d86256ae3bbfe52636755d71f8a237ed411e4
author Mike Klein <mtklein@google.com> Wed Apr 24 14:04:01 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 24 20:15:48 2019 +0000
tree 26680524cd35505f6916d2cbbcf983407b504d03
parent 1659d48b38696636bb1449f3f9832f16d63c3f03

flip static initializer default

Disallowing static global initializers is more Skia-user friendly.

Does it make sense to nest these both together under is_skia_dev_build
(built from our GN tree && !is_official_build)?  Seems like maybe we
can also do the Android TODO?

Change-Id: I882f917c1a8156102ecc9cec58d2aba638015b9e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210210
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 320c0c5..3fe0dc6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -143,18 +143,17 @@
       "SK_GAMMA_CONTRAST=0.0",
     ]
   }
-  if (is_official_build || is_android) {
-    # TODO(bsalomon): it'd be nice to make Android normal.
-    defines += [ "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0" ]
+  if (is_skia_dev_build) {
+    defines += [
+      "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
+      "GR_TEST_UTILS=1",
+    ]
   }
   libs = []
   lib_dirs = []
   if (skia_use_angle) {
     defines += [ "SK_ANGLE" ]
   }
-  if (!is_official_build) {
-    defines += [ "GR_TEST_UTILS=1" ]
-  }
   if (skia_llvm_path != "") {
     defines += [ "SK_LLVM_AVAILABLE" ]
     include_dirs += [ "$skia_llvm_path/include" ]