Use generated shim headers for zlib.

build/shim_headers.gypi

 # Copyright (c) 2012 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 file is meant to be included into a target to handle shim headers
 # in a consistent manner. To use this the following variables need to be
 # defined:
 #   headers_root_path: string: path to directory containing headers
 #   header_filenames: list: list of header file names
 
 {
   'variables': {
-    'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
+    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
   },
   'direct_dependent_settings': {
     'include_dirs+': [

[Mark Mentovai, 2012/12/18 19:48:17]

You probably need one more plus here to have the effect you want:

 - one plus refers to the merge of this gypi file into whatever target includes
it
 - one plus refers to the merge of the direct_dependent_settings section into
whatever target depends on the target that this is moved into.

[Mark Mentovai, 2012/12/18 19:48:17]

Perhaps you’d also like to add 'include_dirs+' outside of
direct_dependent_settings, with one plus fewer than in
direct_dependent_settings, so that anything in the target that includes this
gypi file gets the proper shim header directory in its own include path.

[Paweł Hajdan Jr., 2012/12/18 20:57:41]

Done.

[Paweł Hajdan Jr., 2012/12/18 20:57:41]

Done.

       '<(shim_headers_path)',
     ],
   },
   'actions': [
     {
       'variables': {
         'generator_path': '<(DEPTH)/tools/generate_shim_headers/generate_shim_headers.py',
         'generator_args': [
           '--headers-root', '<(headers_root_path)',
           '--output-directory', '<(shim_headers_path)',
           '<@(header_filenames)',
         ],
       },
       'action_name': 'generate_<(_target_name)_shim_headers',
       'inputs': [
         '<(generator_path)',
       ],
       'outputs': [
         '<!@pymod_do_main(generate_shim_headers <@(generator_args) --outputs)',
       ],
       'action': ['python',
                  '<(generator_path)',
                  '<@(generator_args)',
                  '--generate',
       ],
       'message': 'Generating <(_target_name) shim headers.',
     },
   ],
 }