| OLD | NEW | 
|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 # This file is meant to be included into a target that will have one or more | 5 # This file is meant to be included into a target that will have one or more | 
| 6 # uses of grit_action.gypi. To use this the following variables need to be | 6 # uses of grit_action.gypi. To use this the following variables need to be | 
| 7 # defined: | 7 # defined: | 
| 8 #   grit_out_dir: string: the output directory path | 8 #   grit_out_dir: string: the output directory path | 
| 9 | 9 | 
| 10 # NOTE: This file is optional, not all targets that use grit include it, some | 10 # DO NOT USE THIS FILE. Instead, use qualified includes. | 
| 11 # do their own custom directives instead. | 11 # TODO: Convert everything to qualified includes, and delete this file, | 
|  | 12 # http://crbug.com/401588 | 
| 12 { | 13 { | 
| 13   'conditions': [ | 14   'conditions': [ | 
| 14     # If the target is a direct binary, it needs to be able to find the header, | 15     # If the target is a direct binary, it needs to be able to find the header, | 
| 15     # otherwise it probably a supporting target just for grit so the include | 16     # otherwise it probably a supporting target just for grit so the include | 
| 16     # dir needs to be set on anything that depends on this action. | 17     # dir needs to be set on anything that depends on this action. | 
| 17     ['_type=="executable" or _type=="shared_library" or \ | 18     ['_type=="executable" or _type=="shared_library" or \ | 
| 18       _type=="loadable_module" or _type=="static_library"', { | 19       _type=="loadable_module" or _type=="static_library"', { | 
| 19       'include_dirs': [ | 20       'include_dirs': [ | 
| 20         '<(grit_out_dir)', | 21         '<(grit_out_dir)', | 
| 21       ], | 22       ], | 
| 22     }, { | 23     }, { | 
| 23       'direct_dependent_settings': { | 24       'direct_dependent_settings': { | 
| 24         'include_dirs': [ | 25         'include_dirs': [ | 
| 25           '<(grit_out_dir)', | 26           '<(grit_out_dir)', | 
| 26         ], | 27         ], | 
| 27       }, | 28       }, | 
| 28     }], | 29     }], | 
| 29   ], | 30   ], | 
| 30 } | 31 } | 
| OLD | NEW | 
|---|