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

1 files changed, 24 insertions, 46 deletions

diff --git a/content/content_jni.gypi b/content/content_jni.gypi
index ba35902..60c8c3a 100644
--- a/content/content_jni.gypi
+++ b/content/content_jni.gypi
@@ -7,53 +7,31 @@
   # require specifying the java directory and generate the rest.
   # TODO(jrg): when doing the above, make sure we support multiple
   # output directories (e.g. browser/jni and common/jni if needed).
+  'sources': [
+    'public/android/java/src/org/chromium/content/app/ContentMain.java',
+    'public/android/java/src/org/chromium/content/app/LibraryLoader.java',
+    'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java',
+    'public/android/java/src/org/chromium/content/app/UserAgent.java',
+    'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java',
+    'public/android/java/src/org/chromium/content/browser/ContentSettings.java',
+    'public/android/java/src/org/chromium/content/browser/ContentVideoView.java',
+    'public/android/java/src/org/chromium/content/browser/ContentViewClient.java',
+    'public/android/java/src/org/chromium/content/browser/ContentViewCore.java',
+    'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java',
+    'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java',
+    'public/android/java/src/org/chromium/content/browser/DownloadController.java',
+    'public/android/java/src/org/chromium/content/browser/LocationProvider.java',
+    'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java',
+    'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java',
+    'public/android/java/src/org/chromium/content/browser/TouchPoint.java',
+    'public/android/java/src/org/chromium/content/common/CommandLine.java',
+    'public/android/java/src/org/chromium/content/common/DeviceInfo.java',
+    'public/android/java/src/org/chromium/content/common/SurfaceCallback.java',
+    'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java',
+    'public/android/java/src/org/chromium/content/common/TraceEvent.java',
+   ],
   'variables': {
-    'java_sources': [
-      'public/android/java/src/org/chromium/content/app/ContentMain.java',
-      'public/android/java/src/org/chromium/content/app/LibraryLoader.java',
-      'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java',
-      'public/android/java/src/org/chromium/content/app/UserAgent.java',
-      'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java',
-      'public/android/java/src/org/chromium/content/browser/ContentSettings.java',
-      'public/android/java/src/org/chromium/content/browser/ContentVideoView.java',
-      'public/android/java/src/org/chromium/content/browser/ContentViewClient.java',
-      'public/android/java/src/org/chromium/content/browser/ContentViewCore.java',
-      'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java',
-      'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java',
-      'public/android/java/src/org/chromium/content/browser/DownloadController.java',
-      'public/android/java/src/org/chromium/content/browser/LocationProvider.java',
-      'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java',
-      'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java',
-      'public/android/java/src/org/chromium/content/browser/TouchPoint.java',
-      'public/android/java/src/org/chromium/content/common/CommandLine.java',
-      'public/android/java/src/org/chromium/content/common/DeviceInfo.java',
-      'public/android/java/src/org/chromium/content/common/SurfaceCallback.java',
-      'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java',
-      'public/android/java/src/org/chromium/content/common/TraceEvent.java',
-    ],
-    'jni_headers': [
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_settings_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_video_view_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_core_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_statics_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/remote_debugging_controller_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/touch_point_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_info_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_texture_listener_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h',
-    ],
+    'jni_gen_dir': 'content'
   },
   'includes': [ '../build/jni_generator.gypi' ],
 }