Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(865)

Unified Diff: base/base.gyp

Issue 12255042: [Android] Introduce a Java wrapper for TemplateUrlService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 7c63ec2a909f20cc89aec2188933709359c1ef1c..3cb206868af7eaf19005811b88c4a9bf93b4b551 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',
@@ -1114,11 +1115,46 @@
'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': {
'java_in_dir': '../base/android/java',
},
+ 'dependencies': [
+ 'java_hashmap_jni_headers',
+ 'java_iterator_jni_headers',
+ 'java_set_jni_headers',
+ ],
'includes': [ '../build/java.gypi' ],
},
{
« base/android/jni_map.h ('K') | « base/android/jni_map_unittest.cc ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698