Chromium Code Reviews| Index: base/base.gyp |
| diff --git a/base/base.gyp b/base/base.gyp |
| index c551ec759106d5c9b7bd97e1113e2466e8657af2..fc0964283e104acb255a75a535f6f08f16835b9f 100644 |
| --- a/base/base.gyp |
| +++ b/base/base.gyp |
| @@ -117,29 +117,28 @@ |
| { |
| '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)', |
| - ], |
| - } |
| - ], |
| + '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': [ |
|
Ryan Sleevi
2012/04/14 03:10:50
You will probably want to rename 'jni_headers' and
Yaron
2012/04/16 20:44:56
It's unnecessary because these are passed to input
|
| + '<(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_root': 'base/android/java', |
| + }, |
| + 'includes': [ '../build/java.gypi' ], |
| }, |
| # Include this target for a main() function that simply instantiates |
| # and runs a base::TestSuite. |