Grit cleanup

build/grit_target.gypi

 # Copyright (c) 2011 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 that will have one or more
 # uses of grit_action.gypi. To use this the following variables need to be
 # defined:
 #   grit_out_dir: string: the output directory path
 
 # NOTE: This file is optional, not all targets that use grit include it, some
 # do their own custom directives instead.
 {
-  'direct_dependent_settings': {
-    'include_dirs': [
-      '<(grit_out_dir)',
-    ],
-  },
   'conditions': [
+    # If the target is a direct binary, it needs to be able to find the header,
+    # otherwise it probably a supporting target just for grit so the include
+    # dir needs to be set on anything that depends on this action.
+    ['_type=="executable" or _type=="shared_library" or \

[Mark Mentovai, 2011/03/28 15:14:55]

Why didn’t you use _type=="none"? Because of that dummy_executable thing?

[TVL, 2011/03/28 15:17:08]

yea, I've seen that and "settings" in files, so this seemed like the safer
method.

+      _type=="loadable_module" or _type=="static_library"', {
+      'include_dirs': [
+        '<(grit_out_dir)',
+      ],
+    }, {
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(grit_out_dir)',
+        ],
+      },
+    }],
     ['OS=="win"', {
       'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: