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

Unified Diff: chrome/chrome_browser.gypi

Issue 12255042: [Android] Introduce a Java wrapper for TemplateUrlService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: get rid of generic map conversion 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: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f14efaee1a0485dedb0bdf4b2cbdc808cf218838..82e20c16c9eea8483362d65b9688eddd7e8a3e5e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1770,6 +1770,8 @@
'browser/search_engines/template_url_prepopulate_data.h',
'browser/search_engines/template_url_service.cc',
'browser/search_engines/template_url_service.h',
+ 'browser/search_engines/template_url_service_android.cc',
+ 'browser/search_engines/template_url_service_android.h',
'browser/search_engines/template_url_service_factory.cc',
'browser/search_engines/template_url_service_factory.h',
'browser/search_engines/template_url_service_observer.h',
@@ -2738,6 +2740,7 @@
['OS=="android"', {
'dependencies': [
'../components/components.gyp:web_contents_delegate_android',
+ 'java_hashmap_jni_headers',
'chrome_browser_jni_headers',
],
'dependencies!': [
@@ -3121,6 +3124,7 @@
'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
+ 'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
'android/java/src/org/chromium/chrome/browser/TabBase.java',
'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
],
@@ -3129,6 +3133,16 @@
},
'includes': [ '../build/jni_generator.gypi' ],
},
+ {
+ 'target_name': 'java_hashmap_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'jni_gen_dir': 'chrome',
+ 'input_java_class': 'java/util/HashMap.class',
+ 'input_jar_file': '<(android_sdk)/android.jar',
+ },
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ],
+ },
],
},
],

Powered by Google App Engine
This is Rietveld 408576698