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

Unified Diff: net/net.gyp

Issue 10073024: Add NetworkChangeNotifier for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 b1baccf95ab71d8903d336a617560533b387196f..d83c32d6201fd9a12d329b7123c03c13955e5d16 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -39,6 +39,10 @@
'net_resources',
],
'sources': [
+ 'android/network_change_notifier.cc',
+ 'android/network_change_notifier.h',
+ 'android/network_change_notifier_factory.cc',
+ 'android/network_change_notifier_factory.h',
'android/network_library.cc',
'android/network_library.h',
'base/address_family.h',
@@ -979,11 +983,13 @@
],
'dependencies': [
'../build/android/system.gyp:ssl',
+ 'android/java/java.gyp:net_java',
+ 'net_jni_headers',
],
'sources/': [
# TODO(jingzhao): The below files are excluded because of the
# missing JNI, add them back when JNI is ready.
- ['exclude', '^android/'],
+ ['exclude', '^android/network_library'],
],
}, { # else OS! = "android"
'defines': [
@@ -1786,6 +1792,33 @@
},
]
}],
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'net_jni_headers',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'generate_jni_headers',
+ 'inputs': [
+ '<(DEPTH)/base/android/jni_generator/jni_generator.py',
+ 'android/java/org/chromium/net/NetworkChangeNotifier.java',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',
+ ],
+ 'action': [
+ 'python',
+ '<(DEPTH)/base/android/jni_generator/jni_generator.py',
+ '-o',
+ '<@(_inputs)',
+ '<@(_outputs)',
Ryan Sleevi 2012/04/13 22:37:58 Please consider using jni_generator.gypi, as menti
Yaron 2012/04/17 16:18:03 Done.
+ ],
+ },
+ ],
+ }
+ ],
+ }],
['OS=="win"', {
'targets': [
{
« net/android/network_change_notifier.cc ('K') | « net/android/network_change_notifier_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698