| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index c114875a7f868ea9e9da1e49082e9a7e3cbd4f29..a0d11c54d8cd650e6028bdded86948bbbac76678 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -423,6 +423,7 @@
|
| # Tests.
|
| 'android/jni_android_unittest.cc',
|
| 'android/jni_array_unittest.cc',
|
| + 'android/jni_map_unittest.cc',
|
| 'android/jni_string_unittest.cc',
|
| 'android/path_utils_unittest.cc',
|
| 'android/scoped_java_ref_unittest.cc',
|
| @@ -1110,12 +1111,47 @@
|
| 'includes': [ '../build/jni_generator.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'java_hashmap_jni_headers',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'jni_gen_dir': 'base',
|
| + 'input_java_class': 'java/util/HashMap.class',
|
| + 'input_jar_file': '<(android_sdk)/android.jar',
|
| + },
|
| + 'includes': [ '../build/jar_file_jni_generator.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'java_iterator_jni_headers',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'jni_gen_dir': 'base',
|
| + 'input_java_class': 'java/util/Iterator.class',
|
| + 'input_jar_file': '<(android_sdk)/android.jar',
|
| + },
|
| + 'includes': [ '../build/jar_file_jni_generator.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'java_set_jni_headers',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'jni_gen_dir': 'base',
|
| + 'input_java_class': 'java/util/Set.class',
|
| + 'input_jar_file': '<(android_sdk)/android.jar',
|
| + },
|
| + 'includes': [ '../build/jar_file_jni_generator.gypi' ],
|
| + },
|
| + {
|
| 'target_name': 'base_java',
|
| 'type': 'none',
|
| 'variables': {
|
| 'package_name': 'base',
|
| 'java_in_dir': '../base/android/java',
|
| },
|
| + 'dependencies': [
|
| + 'java_hashmap_jni_headers',
|
| + 'java_iterator_jni_headers',
|
| + 'java_set_jni_headers',
|
| + ],
|
| 'includes': [ '../build/java.gypi' ],
|
| },
|
| {
|
|
|