Move sanitizer and symbol flags out of BUILDCONFIG

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 471 matching lines @@
       "//third_party/android_tools:cpu_features",
     ]
   }
 
   if (skia_support_pdf) {
     deps += [ "//third_party/sfntly" ]
     sources += gypi_skia_pdf.sources
   }
 
   if (is_android && !is_debug) {
-    configs -= [ "//build/config/compiler:optimize" ]
+    configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   if (is_ios) {
     libs = [ "ImageIO.framework" ]
     set_sources_assignment_filter([])
     sources += [
       "//third_party/skia/src/ports/SkFontHost_mac.cpp",
       "//third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp",
       "//third_party/skia/src/utils/mac/SkStream_mac.cpp",
@@ skipping 80 matching lines @@
     if (mips_dsp_rev >= 1) {
       sources = gypi_skia_opts.mips_dsp_sources
     } else {
       sources = gypi_skia_opts.none_sources
     }
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }
 
   if (is_android && !is_debug) {
-    configs -= [ "//build/config/compiler:optimize" ]
+    configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
@@ skipping 62 matching lines @@
     ]
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
     ]
   }
 }