From 9bd301d640ff63c280b202c7dd00bc00a3315ff4 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Mar 2017 16:04:34 +0000 Subject: Revert "skslc can now be compiled with no Skia dependencies, in preparation for its eventual" This reverts commit f3333c89bf05fc602d9bf8e1e24547668c660383. Reason for revert: breaking the bots Original change's description: > skslc can now be compiled with no Skia dependencies, in preparation for its eventual > role in Skia's build process. > > This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a. > > BUG=skia: > > Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02 > Reviewed-on: https://skia-review.googlesource.com/10802 > Commit-Queue: Ethan Nicholas > Reviewed-by: Ben Wagner > TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: Ic7b50d391d25b3870acffa9764cbafc7f5c3be89 Reviewed-on: https://skia-review.googlesource.com/10962 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- fuzz/fuzz.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fuzz/fuzz.cpp') diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index 8e2a73376f..6764a62e44 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -557,7 +557,7 @@ static void fuzz_filter_fuzz(sk_sp bytes) { #if SK_SUPPORT_GPU static void fuzz_sksl2glsl(sk_sp bytes) { SkSL::Compiler compiler; - SkSL::String output; + SkString output; SkSL::Program::Settings settings; sk_sp caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); -- cgit v1.2.3