Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'mojom_bindings_generator_variables.gypi', | 7 'mojom_bindings_generator_variables.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'mojom_base_output_dir': | 10 'mojom_base_output_dir': |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 ], | 44 ], |
| 45 'direct_dependent_settings': { | 45 'direct_dependent_settings': { |
| 46 'sources': [ | 46 'sources': [ |
| 47 '<@(mojom_generated_outputs)', | 47 '<@(mojom_generated_outputs)', |
| 48 ], | 48 ], |
| 49 # Include paths needed to compile the generated sources into a library. | 49 # Include paths needed to compile the generated sources into a library. |
| 50 'include_dirs': [ | 50 'include_dirs': [ |
| 51 '<(DEPTH)', | 51 '<(DEPTH)', |
| 52 '<(SHARED_INTERMEDIATE_DIR)', | 52 '<(SHARED_INTERMEDIATE_DIR)', |
| 53 ], | 53 ], |
| 54 # Make sure the generated header files are available for any static library | |
| 55 # that depends on a static library that depends on this generator. | |
| 56 'hard_dependency': 1, | |
| 54 'direct_dependent_settings': { | 57 'direct_dependent_settings': { |
|
Nico
2014/11/20 21:33:28
Having a direct_dependent_settings child in a dire
jamesr
2014/11/20 21:41:31
all_dependent_settings seems too extreme (that mea
Nico
2014/11/20 21:45:14
Try harder? As is, this works fine for 2 levels of
Nick Bray (chromium)
2014/11/20 21:48:55
all_dependent_settings was deemed too extreme on c
| |
| 55 # Include paths needed to find the generated header files and their | 58 # Include paths needed to find the generated header files and their |
| 56 # transitive dependancies when using the library. | 59 # transitive dependancies when using the library. |
| 57 'include_dirs': [ | 60 'include_dirs': [ |
| 58 '<(DEPTH)', | 61 '<(DEPTH)', |
| 59 '<(SHARED_INTERMEDIATE_DIR)', | 62 '<(SHARED_INTERMEDIATE_DIR)', |
| 60 ], | 63 ], |
| 61 'variables': { | 64 'variables': { |
| 62 'generated_src_dirs': [ | 65 'generated_src_dirs': [ |
| 63 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', | 66 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', |
| 64 ], | 67 ], |
| 65 }, | 68 }, |
| 66 } | 69 } |
| 67 }, | 70 }, |
| 68 'hard_dependency': 1, | |
|
Nico
2014/11/20 21:33:28
Don't you need both this too?
Nick Bray (chromium)
2014/11/20 21:48:55
I believe hard_dependency only affects dependencie
| |
| 69 } | 71 } |
| OLD | NEW |