Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: net/net.gyp

Issue 10912136: Build NetError.java to use in java side tests by preprocessing net_errors.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 448045cdbcfc45b6d0b1cd53863adbcdfb677edd..bbb8f9acdc8a28a33c6c0b390f8a66f6efcb5a44 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2073,6 +2073,7 @@
},
'dependencies': [
'../base/base.gyp:base_java',
+ 'net_errors_java',
Yaron 2012/09/07 01:05:44 This should be added to export_dependent_settings
],
'export_dependent_settings': [
'../base/base.gyp:base_java',
@@ -2089,6 +2090,7 @@
'dependencies': [
'../base/base.gyp:base_java',
'../base/base.gyp:base_java_test_support',
+ 'net_errors_java',
Yaron 2012/09/07 01:05:44 This should be pulled transitively through net_jav
],
'export_dependent_settings': [
'../base/base.gyp:base_java',
@@ -2096,6 +2098,37 @@
],
'includes': [ '../build/java.gypi' ],
},
+ {
+ 'target_name': 'net_errors_java',
Yaron 2012/09/07 01:05:44 This should use a new gyp template (like build/jav
joth 2012/09/07 21:45:46 right now net_error_list.h is the only known examp
+ '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',
Yaron 2012/09/07 01:05:44 I don't see where this java file gets compiled or
joth 2012/09/07 21:45:46 the 'additional_src_dirs' statement above shoves t
Yaron 2012/09/07 22:49:06 Right, thanks!
+ ],
+ '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

Powered by Google App Engine
This is Rietveld 408576698