Use gypi form of blink_skia_config.

The file blink_skia_config.gyp is changing to a gypi.
This allows easier sharing between the gyp and gn build systems.

Review URL: https://codereview.chromium.org/677513003

Cr-Commit-Position: refs/heads/master@{#301105}

skia/BUILD.gn

@@ -11,6 +11,15 @@ if (cpu_arch == "arm") {
 skia_support_gpu = !is_ios
 skia_support_pdf = !is_ios && printing_mode != 0
 
+# The list of Skia defines that are to be set for blink.
+gypi_blink_skia_defines = exec_script(
+    "//build/gypi_to_gn.py",
+    [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),
+      "--replace=<(skia_include_path)=//third_party/skia/include",
+      "--replace=<(skia_src_path)=//third_party/skia/src" ],
+    "scope",
+    [ "//third_party/WebKit/public/blink_skia_config.gypi" ])
+
 # The list of Skia defines that are to be set for chromium.
 gypi_skia_defines = exec_script(
     "//build/gypi_to_gn.py",
@@ -98,7 +107,8 @@ config("skia_config") {
     "//third_party/skia/src/lazy",
   ]
 
-  defines = gypi_skia_defines.skia_for_chromium_defines
+  defines = gypi_blink_skia_defines.blink_skia_defines
+  defines += gypi_skia_defines.skia_for_chromium_defines
 
   defines += [
     "SK_ENABLE_INST_COUNT=0",

skia/skia_common.gypi

@@ -6,6 +6,9 @@
 # Skia build.
 {
   'includes': [
+    # blink_skia_config.gypi defines blink_skia_defines
+    '../third_party/WebKit/public/blink_skia_config.gypi',
+
     # skia_for_chromium_defines.gypi defines skia_for_chromium_defines
     '../third_party/skia/gyp/skia_for_chromium_defines.gypi',
   ],
@@ -156,6 +159,10 @@
       'GR_GL_IGNORE_ES3_MSAA=0',
       'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
 
+      # This variable contains additional defines, specified in blink's
+      # blink_skia_config.gypi file.
+      '<@(blink_skia_defines)',
+
       # This variable contains additional defines, specified in skia's
       # skia_for_chromium_defines.gypi file.
       '<@(skia_for_chromium_defines)',

skia/skia_library.gypi

@@ -205,14 +205,6 @@
       ],
     }],
 
-    [ 'OS != "ios"', {
-      'dependencies': [
-        '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config',
-      ],
-      'export_dependent_settings': [
-        '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config',
-      ],
-    }],
     [ 'OS != "mac"', {
       'sources/': [
         ['exclude', '/mac/']