Update from https://crrev.com/304715

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 290 matching lines @@
     "ext/skia_utils_win.h",
     "ext/vector_canvas.h",
     "ext/vector_platform_device_emf_win.cc",
     "ext/vector_platform_device_emf_win.h",
   ]
 
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   sources += gypi_skia_core.sources
   sources += gypi_skia_effects.sources
   sources += gypi_skia_utils.sources
-  sources += gypi_skia_pdf.sources
   sources += gypi_values.skia_library_sources
 
   if (cpu_arch == "arm") {
     sources += [
       "//third_party/skia/src/core/SkUtilsArm.cpp",
       "//third_party/skia/src/core/SkUtilsArm.h",
     ]
   }
 
   # GPU
@@ skipping 14 matching lines @@
   "//third_party/skia/include/utils/SkDumpCanvas.h",
   "//third_party/skia/include/utils/SkEventTracer.h",
   "//third_party/skia/include/utils/SkInterpolator.h",
   "//third_party/skia/include/utils/SkLayer.h",
   "//third_party/skia/include/utils/SkMeshUtils.h",
   "//third_party/skia/include/utils/SkNinePatch.h",
   "//third_party/skia/include/utils/SkParse.h",
   "//third_party/skia/include/utils/SkParsePaint.h",
   "//third_party/skia/include/utils/SkParsePath.h",
   "//third_party/skia/include/utils/SkRandom.h",
-  "//third_party/skia/include/utils/SkWGL.h",
 
   "//third_party/skia/src/utils/SkBitmapHasher.cpp",
   "//third_party/skia/src/utils/SkBitmapHasher.h",
   "//third_party/skia/src/utils/SkBoundaryPatch.cpp",
   "//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
   "//third_party/skia/src/utils/SkCamera.cpp",
   "//third_party/skia/src/utils/SkCanvasStack.h",
   "//third_party/skia/src/utils/SkCubicInterval.cpp",
   "//third_party/skia/src/utils/SkCullPoints.cpp",
   "//third_party/skia/src/utils/SkDumpCanvas.cpp",
@@ skipping 184 matching lines @@
     set_sources_assignment_filter(sources_assignment_filter)
     deps += [
       "//third_party/expat",
       "//third_party/freetype",
       "//third_party/android_tools:cpu_features",
     ]
   }
 
   if (skia_support_pdf) {
     deps += [ "//third_party/sfntly" ]
+    sources += gypi_skia_pdf.sources
   }
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 }
 
 # Separated out so it can be compiled with different flags for SSE.
 source_set("skia_opts") {
@@ skipping 141 matching lines @@
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = [ ":skia" ]
 }