Cleanup needed to use WindowContext for Android

tools/gpu/GrContextFactory.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContextFactory.h"
 #include "gl/GLTestContext.h"
 
 #if SK_ANGLE
     #include "gl/angle/GLTestContext_angle.h"
 #endif
 #if SK_COMMAND_BUFFER
     #include "gl/command_buffer/GLTestContext_command_buffer.h"
 #endif
 #include "gl/debug/DebugGLTestContext.h"
 #if SK_MESA
     #include "gl/mesa/GLTestContext_mesa.h"
 #endif
-#if SK_VULKAN
+#ifdef SK_VULKAN
 #include "vk/VkTestContext.h"
 #endif
 #include "gl/null/NullGLTestContext.h"
 #include "gl/GrGLGpu.h"
 #include "GrCaps.h"
 
 namespace sk_gpu_test {
 GrContextFactory::GrContextFactory() { }
 
 GrContextFactory::GrContextFactory(const GrContextOptions& opts)
@@ skipping 173 matching lines @@
     Context& context = fContexts.push_back();
     context.fBackend = backend;
     context.fTestContext = testCtx.release();
     context.fGrContext = SkRef(grCtx.get());
     context.fType = type;
     context.fOptions = options;
     context.fAbandoned = false;
     return ContextInfo(context.fBackend, context.fTestContext, context.fGrContext);
 }
 }  // namespace sk_gpu_test