Use generated shim headers for zlib.

build/shim_headers.gypi

Index: build/shim_headers.gypi
diff --git a/build/shim_headers.gypi b/build/shim_headers.gypi
index cf0914d9f52a5477a30f12ed98e94a749dd9ed83..c9a3257dc2e9e06366ae5baee977dcd1d916c4f3 100644
--- a/build/shim_headers.gypi
+++ b/build/shim_headers.gypi
@@ -10,7 +10,7 @@
 
 {
   '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.