Revert of Move uils and sksl to a common sources GYP file.

gn/shared_sources.gni

Index: gn/shared_sources.gni
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 9a4af745382c3f17c871c1df482f987dd577784f..8525883e7c839ea10069a6d747c36eeafc2d7a82 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -69,14 +69,27 @@
                         [ "../gyp/pdf.gypi" ])
 skia_pdf_sources = _pdf_gypi.sources
 
-_sources_gypi = exec_script("gypi_to_gn.py",
+# SKSL.
+_sksl_gypi = exec_script("gypi_to_gn.py",
                          [
-                           rebase_path("../gyp/skia_sources.gypi"),
+                           rebase_path("../gyp/sksl.gypi"),
+                           "--replace=<(skia_include_path)=$_path_to_include",
+                           "--replace=<(skia_src_path)=$_path_to_src",
                          ],
                          "scope",
-                         [ "../gyp/skia_sources.gypi" ])
-skia_sksl_sources = get_path_info(_sources_gypi.sksl_sources, "abspath")
-skia_utils_sources = get_path_info(_sources_gypi.utils_sources, "abspath")
+                         [ "../gyp/sksl.gypi" ])
+skia_sksl_sources = _sksl_gypi.sources
+
+# Utils.
+_utils_gypi = exec_script("gypi_to_gn.py",
+                          [
+                            rebase_path("../gyp/utils.gypi"),
+                            "--replace=<(skia_include_path)=$_path_to_include",
+                            "--replace=<(skia_src_path)=$_path_to_src",
+                          ],
+                          "scope",
+                          [ "../gyp/utils.gypi" ])
+skia_utils_sources = _utils_gypi.sources
 
 # Skia Chromium defines. These flags will be defined in chromium If these
 # become 'permanent', they should be moved into Chrome's skia build file.