Chromium Code Reviews| 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' ], |
| + }, |
| + ], |
| + }, |
| + ], |
| + ], |
| } |