diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 04:39:52 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 04:39:52 +0000 |
| commit | 65208a08fd10dc98b4c21676d5113359303a12a6 (patch) | |
| tree | b178d8ec34465c308f737a657936907a38a65fc0 /base/base.gyp | |
| parent | 636295605fea1bf869738dc36315afbc3a2dfa28 (diff) | |
| download | chromium_src-65208a08fd10dc98b4c21676d5113359303a12a6.zip chromium_src-65208a08fd10dc98b4c21676d5113359303a12a6.tar.gz chromium_src-65208a08fd10dc98b4c21676d5113359303a12a6.tar.bz2 | |
Add templates for building java and running the jni_generator.
As requested in http://codereview.chromium.org/10073024/, I've created
templates for these two actions. I've also applied them to base.
Review URL: http://codereview.chromium.org/10081035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/base/base.gyp b/base/base.gyp index 25d5756..e070ee2 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -114,33 +114,6 @@ 4244, ], }, - { - 'target_name': 'base_jni_headers', - 'type': 'none', - 'actions': [ - { - 'action_name': 'generate_jni_headers', - 'inputs': [ - 'android/jni_generator/jni_generator.py', - 'android/java/org/chromium/base/BuildInfo.java', - 'android/java/org/chromium/base/PathUtils.java', - 'android/java/org/chromium/base/SystemMessageHandler.java', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/base/jni/build_info_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/base/jni/system_message_handler_jni.h', - ], - 'action': [ - 'python', - 'android/jni_generator/jni_generator.py', - '-o', - '<@(_inputs)', - '<@(_outputs)', - ], - } - ], - }, # Include this target for a main() function that simply instantiates # and runs a base::TestSuite. { @@ -546,6 +519,36 @@ }, ], 'conditions': [ + ['OS == "android"', { + 'targets': [ + { + 'target_name': 'base_jni_headers', + 'type': 'none', + 'variables': { + 'java_sources': [ + 'android/java/org/chromium/base/BuildInfo.java', + 'android/java/org/chromium/base/PathUtils.java', + 'android/java/org/chromium/base/SystemMessageHandler.java', + ], + 'jni_headers': [ + '<(SHARED_INTERMEDIATE_DIR)/base/jni/build_info_jni.h', + '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h', + '<(SHARED_INTERMEDIATE_DIR)/base/jni/system_message_handler_jni.h', + ], + }, + 'includes': [ '../build/jni_generator.gypi' ], + }, + { + 'target_name': 'base_java', + 'type': 'none', + 'variables': { + 'package_name': 'base', + 'java_in_dir': 'android/java', + }, + 'includes': [ '../build/java.gypi' ], + }, + ], + }], ['OS == "win"', { 'targets': [ { |