From e46f661504b9d4c2de4dcb6008b9cde4105f871a Mon Sep 17 00:00:00 2001
From: "bulach@chromium.org"
 <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 19 Jul 2012 20:02:55 +0000
Subject: 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
---
 testing/android/native_test.gyp | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'testing')

diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 90d080b..fb21f27 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -59,7 +59,7 @@
               '-Wl,--exclude-libs=ALL',
             ],
           },
-          'dependencies': [ 
+          'dependencies': [
             '../../base/base.gyp:base',
             '../../base/base.gyp:test_support_base',
             '../gtest.gyp:gtest',
@@ -69,26 +69,13 @@
         {
           'target_name': 'native_test_jni_headers',
           'type': 'none',
-          'actions': [
-            {
-              'action_name': 'generate_jni_headers',
-              'inputs': [
-                '../../base/android/jni_generator/jni_generator.py',
-                'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/testing/android/jni/'
-                'chrome_native_test_activity_jni.h',
-              ],
-              'action': [
-                'python',
-                '../../base/android/jni_generator/jni_generator.py',
-                '-o',
-                '<@(_inputs)',
-                '<@(_outputs)',
-              ],
-            }
+          'sources': [
+            'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
           ],
+          'variables': {
+            'jni_gen_dir': 'testing',
+          },
+          'includes': [ '../../build/jni_generator.gypi' ],
           # So generated jni headers can be found by targets that
           # depend on this.
           'direct_dependent_settings': {
-- 
cgit v1.1