Chromium Code Reviews| Index: net/net.gyp |
| diff --git a/net/net.gyp b/net/net.gyp |
| index 448045cdbcfc45b6d0b1cd53863adbcdfb677edd..8e91939d85127084975c3ea08b0d6772fff81581 100644 |
| --- a/net/net.gyp |
| +++ b/net/net.gyp |
| @@ -2076,6 +2076,7 @@ |
| ], |
| 'export_dependent_settings': [ |
| '../base/base.gyp:base_java', |
| + 'net_errors_java', |
|
Yaron
2012/09/07 22:49:06
Sorry if I was unclear. This needs to be in both "
cjhopman
2012/09/07 23:03:23
I believe that this should only be in dependencies
|
| ], |
| 'includes': [ '../build/java.gypi' ], |
| }, |
| @@ -2089,6 +2090,7 @@ |
| 'dependencies': [ |
| '../base/base.gyp:base_java', |
| '../base/base.gyp:base_java_test_support', |
| + 'net_java', |
| ], |
| 'export_dependent_settings': [ |
| '../base/base.gyp:base_java', |
| @@ -2096,6 +2098,39 @@ |
| ], |
| 'includes': [ '../build/java.gypi' ], |
| }, |
| + { |
| + # This should be extracted to a gypi file and parametrized if we have more use cases of |
|
willchan no longer on Chromium
2012/09/07 22:50:13
80 cols
s/parametrized/parameterized/
|
| + # using the preprocessor to build java files. |
| + 'target_name': 'net_errors_java', |
| + 'type': 'none', |
| + 'direct_dependent_settings': { |
| + 'variables': { |
| + 'additional_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/'], |
| + }, |
| + }, |
| + 'actions': [ |
| + { |
| + 'action_name': 'generate_net_errors_java', |
| + 'inputs': [ |
| + 'android/java/net_errors_java.template', |
| + ], |
| + 'outputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java', |
| + ], |
| + 'action': [ |
| + 'gcc', |
| + '-x', 'c-header', |
| + '-E', '-P', |
| + '-I', '..', |
| + '-o', |
| + '<@(_outputs)', |
| + '<@(_inputs)', |
| + ], |
| + 'message': 'Preprocessing <(_inputs)', |
| + 'process_outputs_as_sources': 1, |
| + }, |
| + ], |
| + }, |
| ], |
| }], |
| # Special target to wrap a gtest_target_type==shared_library |