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

Unified Diff: net/net.gyp

Issue 10171009: Update net/android/network_library.cc with fresher code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added comments, fixed caller 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 52588c31855f749b4a675559f8ed3997cae16c8c..1488b3b1ed34ddbf4788bc33f0a61c22e075e0fd 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -989,11 +989,6 @@
'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.
- 'android/network_library.cc',
- ],
}, { # else OS! = "android"
'defines': [
# These are the features Android doesn't support.
@@ -1803,9 +1798,11 @@
'type': 'none',
'variables': {
'java_sources': [
+ 'android/java/org/chromium/net/AndroidNetworkLibrary.java',
'android/java/org/chromium/net/NetworkChangeNotifier.java',
],
'jni_headers': [
+ '<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h',
'<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',
],
},
« build/android/gtest_filter/net_unittests_disabled ('K') | « net/base/cert_verify_proc_openssl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698