diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/android/java/NetError.template (renamed from net/android/java/net_errors_java.template) | 0 | ||||
| -rw-r--r-- | net/net.gyp | 38 |
2 files changed, 8 insertions, 30 deletions
diff --git a/net/android/java/net_errors_java.template b/net/android/java/NetError.template index f6c1661..f6c1661 100644 --- a/net/android/java/net_errors_java.template +++ b/net/android/java/NetError.template diff --git a/net/net.gyp b/net/net.gyp index 0a32b01..74eb3a8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2297,39 +2297,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/android/java_cpp_template.gypi' ], + } ], }], # Special target to wrap a gtest_target_type==shared_library |