diff options
Diffstat (limited to 'chromium/build/jni_generator.gypi')
| -rw-r--r-- | chromium/build/jni_generator.gypi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/build/jni_generator.gypi b/chromium/build/jni_generator.gypi index a6c8364d44c..da99331ec52 100644 --- a/chromium/build/jni_generator.gypi +++ b/chromium/build/jni_generator.gypi @@ -31,7 +31,11 @@ 'variables': { 'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py', 'jni_generator_jarjar_file%': '', - 'jni_generator_ptr_type%': 'int', + 'jni_generator_ptr_type%': 'long', + # A comma separated string of include files. + 'jni_generator_includes%': ( + 'base/android/jni_generator/jni_generator_helper.h' + ), }, 'rules': [ { @@ -49,6 +53,8 @@ '<(RULE_INPUT_PATH)', '--output_dir', '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni', + '--includes', + '<(jni_generator_includes)', '--optimize_generation', '<(optimize_jni_generation)', '--jarjar', @@ -67,6 +73,11 @@ ], }, ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)', + ], + }, # This target exports a hard dependency because it generates header # files. 'hard_dependency': 1, |