gn: Fix build issues blocking gfx from being built

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")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 160 matching lines @@
     "IGNORE_ROT_AA_RECT_OPT",
 
     "SK_IGNORE_BLURRED_RRECT_OPT",
 
     # this flag forces Skia not to use typographic metrics with GDI.
     "SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS",
 
     "SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   ]
 
+  if (component_mode == "shared_library") {
+    defines += [ "SKIA_IMPLEMENTATION=1" ]
+  }
+
   if (cpu_arch == "arm") {
     if (arm_use_neon) {
       defines += [ "SK_ARM_HAS_NEON" ]
     }
     if (arm_optionally_use_neon) {
       defines += [ "SK_ARM_HAS_OPTIONAL_NEON" ]
     }
   }
 
   # Settings for text blitting, chosen to approximate the system browser.
@@ skipping 315 matching lines @@
   ]
   direct_dependent_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//third_party/zlib",
   ]
 
-  if (component_mode == "shared_library") {
-    defines = [ "SKIA_IMPLEMENTATION=1" ]
-  }
-
   if (is_win) {
     configs -= [
       # Some files define WIN32_LEAN_AND_MEAN and we want to avoid a duplicate
       # definition warning.
       "//build/config/win:lean_and_mean",
     ]
   }
 
   if (is_linux) {
     configs += [
@@ skipping 165 matching lines @@
   }
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
+    ":skia_library_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = [ ":skia" ]
 }