GN: fold :vulkan into :gpu.

BUILD.gn

 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("gn/shared_sources.gni")
 
 declare_args() {
   skia_use_expat = true
   skia_use_fontconfig = is_linux
@@ skipping 285 matching lines @@
   deps = [
     "//third_party/giflib",
   ]
   sources = [
     "src/codec/SkGifCodec.cpp",
   ]
 }
 
 optional("gpu") {
   enabled = skia_enable_gpu
+  public_defines = []
+
   sources = skia_gpu_sources + [ "src/gpu/gl/GrGLDefaultInterface_native.cpp" ]
 
   # These paths need to be absolute to match the ones produced by shared_sources.gni.
   sources -= get_path_info([
                              "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
                              "src/gpu/gl/GrGLDefaultInterface_none.cpp",
                            ],
                            "abspath")
   if (is_android) {
     sources += [ "src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp" ]
   } else if (is_linux) {
     sources += [ "src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp" ]
   } else if (is_mac) {
     sources += [ "src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp" ]
   } else {
     sources += [ "src/gpu/gl/GrGLCreateNativeInterface_none.cpp" ]
   }
+  libs = []

[egdaniel, 2016/09/20 20:52:57]

is there any reason why public_defines is initialized above and libs here?

+
+  if (skia_use_vulkan) {
+    public_defines += [ "SK_VULKAN" ]
+    sources += skia_vk_sources
+    libs += [ "vulkan" ]
+  }
 }
 
 optional("jpeg") {
   enabled = skia_use_libjpeg_turbo
   public_defines = [ "SK_HAS_JPEG_LIBRARY" ]
 
   deps = [
     "//third_party/libjpeg-turbo:libjpeg",
   ]
   sources = [
@@ skipping 39 matching lines @@
 
   deps = [
     "//third_party/freetype2",
   ]
   sources = [
     "src/ports/SkFontHost_FreeType.cpp",
     "src/ports/SkFontHost_FreeType_common.cpp",
   ]
 }
 
-optional("vulkan") {
-  enabled = skia_use_vulkan
-  public_defines = [ "SK_VULKAN" ]
-  libs = [ "vulkan" ]
-  sources = skia_vk_sources
-}
-
 optional("webp") {
   enabled = skia_use_libwebp
   public_defines = [ "SK_HAS_WEBP_LIBRARY" ]
 
   deps = [
     "//third_party/libwebp",
   ]
   sources = [
     "src/codec/SkWebpAdapterCodec.cpp",
     "src/codec/SkWebpCodec.cpp",
@@ skipping 32 matching lines @@
     ":gpu",
     ":jpeg",
     ":none",
     ":pdf",
     ":png",
     ":sse2",
     ":sse41",
     ":sse42",
     ":ssse3",
     ":typeface_freetype",
-    ":vulkan",
     ":webp",
     ":xml",
   ]
 
   sources = []
   sources += skia_core_sources
   sources += skia_effects_sources
   sources += skia_sksl_sources
   sources += skia_utils_sources
   sources += [
@@ skipping 445 matching lines @@
       "tools/get_images_from_skps.cpp",
     ]
     deps = [
       ":flags",
       ":skia",
       "//third_party/jsoncpp",
     ]
     testonly = true
   }
 }