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

Unified Diff: components/gcm_driver.gypi

Issue 285203005: Hook components/gcm_driver up to JNI Generator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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: components/gcm_driver.gypi
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi
index 489a710a88ae7bd51e2f5a04a68d645ffc47e04f..22a9a958f477e88bad5a6a4488d41a56c5758e78 100644
--- a/components/gcm_driver.gypi
+++ b/components/gcm_driver.gypi
@@ -16,6 +16,8 @@
'..',
],
'sources': [
+ 'gcm_driver/android/component_jni_registrar.cc',
+ 'gcm_driver/android/component_jni_registrar.h',
'gcm_driver/default_gcm_app_handler.cc',
'gcm_driver/default_gcm_app_handler.h',
'gcm_driver/gcm_app_handler.h',
@@ -24,6 +26,42 @@
'gcm_driver/system_encryptor.cc',
'gcm_driver/system_encryptor.h',
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ 'gcm_driver_jni_headers',
+ ],
+ }],
+ ],
},
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'gcm_driver_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'variables': {
+ 'java_in_dir': 'gcm_driver/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
+ 'target_name': 'gcm_driver_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ ],
+ 'variables': {
+ 'jni_gen_package': 'gcm_driver',
+ 'jni_generator_ptr_type': 'long',
bulach 2014/05/15 13:05:16 nit: you can remove the jni_generator_ptr_type, so
johnme 2014/05/15 17:39:47 Done.
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ ],
+ },
+ ],
+ ],
}
« no previous file with comments | « chrome/chrome.gyp ('k') | components/gcm_driver/DEPS » ('j') | components/gcm_driver/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698