| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index b5ccff34cfa185aa76a045b9b1c51376a708c8a1..6703dcf1ee64a33f04986ac0f09f3fdf1eb287dd 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -2249,39 +2249,17 @@
|
| 'includes': [ '../build/java.gypi' ],
|
| },
|
| {
|
| - # This should be extracted to a gypi file and parameterized if
|
| - # we have more use cases of using the preprocessor to build java files.
|
| 'target_name': 'net_errors_java',
|
| 'type': 'none',
|
| - 'direct_dependent_settings': {
|
| - 'variables': {
|
| - 'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/'],
|
| - 'additional_input_paths': ['<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java'],
|
| - },
|
| - },
|
| - '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,
|
| - },
|
| + 'sources': [
|
| + 'base/net_error_list.h',
|
| + 'android/java/NetError.template',
|
| ],
|
| - },
|
| + 'variables': {
|
| + 'package_name': 'org.chromium.net',
|
| + },
|
| + 'includes': [ '../build/java_cpp_template.gypi' ],
|
| + }
|
| ],
|
| }],
|
| # Special target to wrap a gtest_target_type==shared_library
|
|
|