Merge 218339 "Submitting https://codereview.chromium.org/2311600..."

skia/skia_library.gypi

 # Copyright 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 {
   'dependencies': [
     'skia_library_opts.gyp:skia_opts',
     '../third_party/zlib/zlib.gyp:zlib',
   ],
 
   'variables': {
     'variables': {
       'conditions': [
         ['OS== "ios"', {
           'skia_support_gpu': 0,
         }, {
           'skia_support_gpu': 1,
         }],
-        ['OS=="ios" or OS=="android"', {
+        ['OS=="ios" or enable_printing == 0', {
           'skia_support_pdf': 0,
         }, {
           'skia_support_pdf': 1,
         }],
       ],
     },
     'skia_support_gpu': '<(skia_support_gpu)',
     'skia_support_pdf': '<(skia_support_pdf)',
 
     # These two set the paths so we can include skia/gyp/core.gypi
@@ skipping 429 matching lines @@
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
     'defines': [
       '<@(skia_export_defines)',
     ],
   },
 }