diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 20:02:55 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 20:02:55 +0000 |
| commit | e46f661504b9d4c2de4dcb6008b9cde4105f871a (patch) | |
| tree | 5577bf583ea221a532ef05a349f6de757823e6ba /net | |
| parent | a5d07699a28d121d0bcabaef645ef7ece9366292 (diff) | |
| download | chromium_src-e46f661504b9d4c2de4dcb6008b9cde4105f871a.zip chromium_src-e46f661504b9d4c2de4dcb6008b9cde4105f871a.tar.gz chromium_src-e46f661504b9d4c2de4dcb6008b9cde4105f871a.tar.bz2 | |
Uses gyp "rules" rather than "actions" templates for the JNI generator.
This allow finer grain control over what is rebuilt.
Also, since we have approval over the generated header file name,
it greatly simplifies both the generator and also all the gyp files
as they no longer need to list the header file and keep in sync with the
java file, so the process now is as simple as adding a single java file
to the sources.
BUG=137069
TEST=build on android
Review URL: https://chromiumcodereview.appspot.com/10798010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/android/network_change_notifier_android.cc | 2 | ||||
| -rw-r--r-- | net/android/network_library.cc | 2 | ||||
| -rw-r--r-- | net/net.gyp | 16 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_android.cc | 2 |
4 files changed, 9 insertions, 13 deletions
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc index 8c74087..8e98bf5 100644 --- a/net/android/network_change_notifier_android.cc +++ b/net/android/network_change_notifier_android.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/android/jni_android.h" -#include "jni/network_change_notifier_jni.h" +#include "jni/NetworkChangeNotifier_jni.h" namespace net { namespace android { diff --git a/net/android/network_library.cc b/net/android/network_library.cc index 57cf551..d518abaf 100644 --- a/net/android/network_library.cc +++ b/net/android/network_library.cc @@ -9,7 +9,7 @@ #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" #include "base/logging.h" -#include "jni/android_network_library_jni.h" +#include "jni/AndroidNetworkLibrary_jni.h" using base::android::AttachCurrentThread; using base::android::ClearException; diff --git a/net/net.gyp b/net/net.gyp index 7cef705..881eeff 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1903,17 +1903,13 @@ { 'target_name': 'net_jni_headers', 'type': 'none', + 'sources': [ + 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', + 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', + 'android/java/src/org/chromium/net/ProxyChangeListener.java', + ], 'variables': { - 'java_sources': [ - 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', - 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', - 'android/java/src/org/chromium/net/ProxyChangeListener.java', - ], - 'jni_headers': [ - '<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/net/jni/proxy_change_listener_jni.h', - ], + 'jni_gen_dir': 'net', }, 'includes': [ '../build/jni_generator.gypi' ], }, diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index 0bb75b8..6a0be78 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -19,7 +19,7 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "googleurl/src/url_parse.h" -#include "jni/proxy_change_listener_jni.h" +#include "jni/ProxyChangeListener_jni.h" #include "net/base/host_port_pair.h" #include "net/proxy/proxy_config.h" |