Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 6b00c158094ee16621cea54e5991791ec8a19d07..282bdbb3eef81b2eb65944ad6ee6af4685d1e7ee 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -820,6 +820,14 @@ |
'../base/base.gyp:base', |
], |
'conditions': [ |
+ ['OS=="android" and _toolset=="target"', { |
Peter Beverloo
2012/09/06 10:09:09
The OS==* conditions in this block start around li
Philippe
2012/09/06 15:49:46
Done.
|
+ 'dependencies': [ |
+ 'net_java', |
+ ], |
+ 'export_dependent_settings': [ |
+ 'net_java', |
+ ], |
+ }], |
['chromeos==1', { |
'sources!': [ |
'base/network_change_notifier_linux.cc', |
@@ -2078,10 +2086,10 @@ |
'java_in_dir': '../net/android/java', |
}, |
'dependencies': [ |
- '../base/base.gyp:base_java', |
+ '../base/base.gyp:base', |
], |
'export_dependent_settings': [ |
- '../base/base.gyp:base_java', |
+ '../base/base.gyp:base', |
], |
'includes': [ '../build/java.gypi' ], |
}, |
@@ -2093,12 +2101,14 @@ |
'java_in_dir': '../net/android/javatests', |
}, |
'dependencies': [ |
- '../base/base.gyp:base_java', |
+ '../base/base.gyp:base', |
'../base/base.gyp:base_java_test_support', |
+ 'net_java', |
], |
'export_dependent_settings': [ |
- '../base/base.gyp:base_java', |
+ '../base/base.gyp:base', |
'../base/base.gyp:base_java_test_support', |
+ 'net_java', |
], |
'includes': [ '../build/java.gypi' ], |
}, |