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

11 files changed, 11 insertions, 11 deletions

diff --git a/content/browser/android/android_browser_process.cc b/content/browser/android/android_browser_process.cc
index 6b1ec64..6d887cb 100644
--- a/content/browser/android/android_browser_process.cc
+++ b/content/browser/android/android_browser_process.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "content/browser/android/content_startup_flags.h"
 #include "content/public/common/content_constants.h"
-#include "jni/android_browser_process_jni.h"
+#include "jni/AndroidBrowserProcess_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index 284c1fe..4511c37 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -10,7 +10,7 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
-#include "jni/content_settings_jni.h"
+#include "jni/ContentSettings_jni.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/content/browser/android/content_view_client.cc b/content/browser/android/content_view_client.cc
index 908ce5c..652796c 100644
--- a/content/browser/android/content_view_client.cc
+++ b/content/browser/android/content_view_client.cc
@@ -23,7 +23,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
-#include "jni/content_view_client_jni.h"
+#include "jni/ContentViewClient_jni.h"
 #include "net/http/http_request_headers.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 5849427..a867ae5 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -13,7 +13,7 @@
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
-#include "jni/content_view_core_jni.h"
+#include "jni/ContentViewCore_jni.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc
index bac7b18..b3537ef9 100644
--- a/content/browser/android/content_view_statics.cc
+++ b/content/browser/android/content_view_statics.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "content/browser/android/content_view_statics.h"
 #include "content/common/android/address_parser.h"
-#include "jni/content_view_statics_jni.h"
+#include "jni/ContentViewStatics_jni.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
diff --git a/content/browser/android/download_controller.cc b/content/browser/android/download_controller.cc
index 16e370a..13b75c7 100644
--- a/content/browser/android/download_controller.cc
+++ b/content/browser/android/download_controller.cc
@@ -18,7 +18,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
-#include "jni/download_controller_jni.h"
+#include "jni/DownloadController_jni.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_request_headers.h"
diff --git a/content/browser/android/remote_debugging_controller.cc b/content/browser/android/remote_debugging_controller.cc
index 763cd16..67f1bd6 100644
--- a/content/browser/android/remote_debugging_controller.cc
+++ b/content/browser/android/remote_debugging_controller.cc
@@ -7,7 +7,7 @@
 #include <jni.h>
 
 #include "content/public/browser/android/devtools_server.h"
-#include "jni/remote_debugging_controller_jni.h"
+#include "jni/RemoteDebuggingController_jni.h"
 
 namespace content {
 
diff --git a/content/browser/android/sandboxed_process_launcher.cc b/content/browser/android/sandboxed_process_launcher.cc
index 9ab99a4..f46f2bb 100644
--- a/content/browser/android/sandboxed_process_launcher.cc
+++ b/content/browser/android/sandboxed_process_launcher.cc
@@ -8,7 +8,7 @@
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "jni/sandboxed_process_launcher_jni.h"
+#include "jni/SandboxedProcessLauncher_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ToJavaArrayOfStrings;
diff --git a/content/browser/android/touch_point.cc b/content/browser/android/touch_point.cc
index 17d888d..70ed9db 100644
--- a/content/browser/android/touch_point.cc
+++ b/content/browser/android/touch_point.cc
@@ -8,7 +8,7 @@
 #include "base/time.h"
 #include "base/logging.h"
 
-#include "jni/touch_point_jni.h"
+#include "jni/TouchPoint_jni.h"
 
 using WebKit::WebTouchEvent;
 using WebKit::WebTouchPoint;
diff --git a/content/browser/device_orientation/data_fetcher_impl_android.cc b/content/browser/device_orientation/data_fetcher_impl_android.cc
index 0354635..e51af51 100644
--- a/content/browser/device_orientation/data_fetcher_impl_android.cc
+++ b/content/browser/device_orientation/data_fetcher_impl_android.cc
@@ -9,7 +9,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "content/browser/device_orientation/orientation.h"
-#include "jni/device_orientation_jni.h"
+#include "jni/DeviceOrientation_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/content/browser/geolocation/location_api_adapter_android.cc
index 9c2356c..6028a43 100644
--- a/content/browser/geolocation/location_api_adapter_android.cc
+++ b/content/browser/geolocation/location_api_adapter_android.cc
@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "content/browser/geolocation/location_provider_android.h"
-#include "jni/location_provider_jni.h"
+#include "jni/LocationProvider_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;