Use generated shim headers for zlib.

skia/config/SkUserConfig.h

 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 92 matching lines @@
 /*  Some envorinments do not suport writable globals (eek!). If yours does not,
     define this flag.
  */
 //#define SK_USE_RUNTIME_GLOBALS
 
 /*  If zlib is available and you want to support the flate compression
     algorithm (used in PDF generation), define SK_ZLIB_INCLUDE to be the
     include path.
  */
 //#define SK_ZLIB_INCLUDE <zlib.h>
-#if defined(USE_SYSTEM_ZLIB)
-#define SK_ZLIB_INCLUDE <zlib.h>
-#else
 #define SK_ZLIB_INCLUDE "third_party/zlib/zlib.h"
-#endif
 
 /*  Define this to allow PDF scalars above 32k.  The PDF/A spec doesn't allow
     them, but modern PDF interpreters should handle them just fine.
  */
 //#define SK_ALLOW_LARGE_PDF_SCALARS
 
 /*  Define this to provide font subsetter for font subsetting when generating
     PDF documents.
  */
 #define SK_SFNTLY_SUBSETTER \
@@ skipping 111 matching lines @@
 // assertion.
 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
 
 // Uncomment the following line to forward skia trace events to Chrome
 // tracing.
 // #define SK_USER_TRACE_INCLUDE_FILE "skia/ext/skia_trace_shim.h"
 
 // ===== End Chrome-specific definitions =====
 
 #endif