commit ad858e76e339d37743c0c389b061f88599663ecf
author Kevin Lubick <kjlubick@google.com> Thu Jul 22 12:13:21 2021 -0400
committer Kevin Lubick <kjlubick@google.com> Thu Jul 22 16:57:32 2021 +0000
tree 5766dc79b52bf0306ab45f663a5ab26b1d6e46ba
parent 5de8b1950422d002f9c1a1ebdf545364d7d1dcfe

[canvaskit] Fix gm compilation

This removes some files that were deleted in early July 2021

Change-Id: I3a79a0d58eea16b4e14a548261f1279497860275
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431259
Reviewed-by: Brian Osman <brianosman@google.com>

modules/canvaskit/compile_gm.sh

diff --git a/modules/canvaskit/compile_gm.sh b/modules/canvaskit/compile_gm.sh
index 2a00c08..72f9b72 100755
--- a/modules/canvaskit/compile_gm.sh
+++ b/modules/canvaskit/compile_gm.sh
@@ -173,16 +173,6 @@
 GMS_TO_BUILD="gm/*.cpp"
 TESTS_TO_BUILD="tests/*.cpp"
 
-# DSL FP tests need to include compiled test shaders from the `dslfp` subdirectory.
-TESTS_TO_BUILD+=\
-" tests/sksl/dslfp/GrDSLFPTest_DoStatement.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_ForStatement.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_IfStatement.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_SwitchStatement.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_Swizzle.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_Ternary.dsl.cpp"\
-" tests/sksl/dslfp/GrDSLFPTest_WhileStatement.dsl.cpp"
-
 # When developing locally, it can be faster to focus only on the gms or tests you care about
 # (since they all have to be recompiled/relinked) every time. To do so, mark the following as true
 if false; then

public.bzl

diff --git a/public.bzl b/public.bzl
index d45d1a4..eea2c01 100644
--- a/public.bzl
+++ b/public.bzl
@@ -575,20 +575,6 @@
         "src/xml/*.cpp",
         "tests/*.cpp",
         "tests/*.h",
-        "tests/sksl/dslfp/GrDSLFPTest_DoStatement.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_DoStatement.h",
-        "tests/sksl/dslfp/GrDSLFPTest_ForStatement.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_ForStatement.h",
-        "tests/sksl/dslfp/GrDSLFPTest_IfStatement.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_IfStatement.h",
-        "tests/sksl/dslfp/GrDSLFPTest_SwitchStatement.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_SwitchStatement.h",
-        "tests/sksl/dslfp/GrDSLFPTest_Swizzle.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_Swizzle.h",
-        "tests/sksl/dslfp/GrDSLFPTest_Ternary.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_Ternary.h",
-        "tests/sksl/dslfp/GrDSLFPTest_WhileStatement.dsl.cpp",
-        "tests/sksl/dslfp/GrDSLFPTest_WhileStatement.h",
         "tools/AutoreleasePool.h",
         "tools/BigPathBench.inc",
         "tools/BinaryAsset.h",