2 files changed, 3 insertions, 8 deletions
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 62a3f144ef..cd1e47fb77 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -147,16 +147,13 @@ DEFINE_string(pr, "default",
               "[[~]all [~]default [~]dashline [~]nvpr [~]msaa [~]aaconvex "
               "[~]aalinearizing [~]small [~]tess]");
 
-SkExecutor* GpuExecutorForTools() {
+void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) {
     static std::unique_ptr<SkExecutor> gGpuExecutor = (0 != FLAGS_gpuThreads)
         ? SkExecutor::MakeFIFOThreadPool(FLAGS_gpuThreads) : nullptr;
-    return gGpuExecutor.get();
-}
-
-void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) {
-    ctxOptions->fGpuPathRenderers = CollectGpuPathRenderersFromFlags();
+    ctxOptions->fExecutor = gGpuExecutor.get();
     ctxOptions->fAllowPathMaskCaching = FLAGS_cachePathMasks;
     ctxOptions->fSuppressGeometryShaders = FLAGS_noGS;
+    ctxOptions->fGpuPathRenderers = CollectGpuPathRenderersFromFlags();
 }
 
 #endif
diff --git a/tools/flags/SkCommonFlagsGpu.h b/tools/flags/SkCommonFlagsGpu.h
index 780a737391..ffaf2d437f 100644
--- a/tools/flags/SkCommonFlagsGpu.h
+++ b/tools/flags/SkCommonFlagsGpu.h
@@ -64,8 +64,6 @@ inline GpuPathRenderers CollectGpuPathRenderersFromFlags() {
     return gpuPathRenderers;
 }
 
-class SkExecutor* GpuExecutorForTools();
-
 /**
  *  Helper to set GrContextOptions from common GPU flags.
  */