Revert "Pull and build shaderc rather than use checked in lib/header"

This reverts commit 7d4490ecfa4d974003f675ef004e77f85ecfadd2.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1757253002

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

2 files changed, 7 insertions, 70 deletions

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 7762152f59..43204a4548 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -235,17 +235,12 @@
           },
         }],
         [ 'skia_vulkan', {
-          'dependencies': [
-            'shaderc.gyp:shaderc_combined',
-          ],
           'include_dirs': [
-            '../third_party/', # To include files under third_party/vulkan
-            '../third_party/externals/shaderc/libshaderc/include',
+            '../third_party/' # To include files under third_party/vulkan
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '../third_party/', # To include files under third_party/vulkan
-              '../third_party/externals/shaderc/libshaderc/include',
+              '../third_party/' # To include files under third_party/vulkan
             ],
           },
           'conditions' : [
@@ -255,6 +250,7 @@
                   'VCLinkerTool': {
                     'AdditionalDependencies': [
                       'vulkan-1.lib',
+                      'shaderc_combined.lib'
                     ],
                   },
                 },
@@ -266,6 +262,7 @@
                       'VCLinkerTool': {
                       'AdditionalLibraryDirectories': [
                           '../third_party/vulkan',
+                          '../third_party/shaderc/Debug',
                         ],
                       },
                     },
@@ -275,6 +272,7 @@
                       'VCLinkerTool': {
                         'AdditionalLibraryDirectories': [
                           '../third_party/vulkan',
+                          '../third_party/shaderc/Release',
                         ],
                       },
                     },
@@ -284,6 +282,7 @@
                       'VCLinkerTool': {
                         'AdditionalLibraryDirectories': [
                           '../third_party/vulkan',
+                          '../third_party/shaderc/Debug',
                         ],
                       },
                     },
@@ -293,6 +292,7 @@
                       'VCLinkerTool': {
                         'AdditionalLibraryDirectories': [
                           '../third_party/vulkan',
+                          '../third_party/shaderc/Release',
                         ],
                       },
                     },
diff --git a/gyp/shaderc.gyp b/gyp/shaderc.gyp
deleted file mode 100644
index 3619fa2eae..0000000000
--- a/gyp/shaderc.gyp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Builds shaderc for the Vulkan backend
-{
-  'variables': {
-    'conditions': [
-      [ 'CONFIGURATION_NAME == "Release_Developer"', {
-        'shaderc_build_type' : 'Release',
-      }, {
-        'shaderc_build_type' : '<(CONFIGURATION_NAME)',
-      }],
-      [ 'skia_os == "win"', {
-        'shaderc_lib_name' : 'shaderc_combined.lib',
-      }, {
-        'shaderc_lib_name' : 'libshaderc_combined.a',
-      }],
-      [ 'MSVS_VERSION == "2013"', {
-        'shaderc_project_type' : 'MSVS2013',
-      }],
-      [ 'MSVS_VERSION == "2015"', {
-        'shaderc_project_type' : 'MSVS2015',
-      }],
-    ],
-    'skia_build_type' : '<(CONFIGURATION_NAME)',
-  },  
-  'targets': [  
-    {
-      # Call out to a python script to build shaderc_combined and then copy it
-      # to out/<Configuration>
-      'target_name': 'shaderc_combined',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'compile_shaderc',
-          'inputs': [
-            '<!@(python find.py ../third_party/externals/shaderc "*")',
-            '../tools/build_shaderc.py',
-          ],
-          'outputs': [
-             '../out/<(skia_build_type)/shaderc_out_<(skia_arch_type)/libshaderc/<(shaderc_build_type)/<(shaderc_lib_name)',
-          ],
-          'action': ['python', '../tools/build_shaderc.py', '-s', '../third_party/externals/shaderc', '-o', '../out/<(skia_build_type)/shaderc_out_<(skia_arch_type)', '-a', '<(skia_arch_type)', '-t', '<(shaderc_build_type)', '-p', '<(shaderc_project_type)'],
-        },
-      ],     
-      'copies': [
-        {
-          'destination': '../out/<(skia_build_type)',
-          'files': ['../out/<(skia_build_type)/shaderc_out_<(skia_arch_type)/libshaderc/<(shaderc_build_type)/<(shaderc_lib_name)'],
-        },
-      ],
-      'all_dependent_settings': {
-        'link_settings': {
-          'libraries': [
-            '-lshaderc_combined',
-          ],
-        },
-      },
-    },
-  ],
-}