diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 14:41:13 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 14:41:13 +0000 |
| commit | f773eb59fa48d6917845fd1300d598f71ff719c8 (patch) | |
| tree | 6948536eec7c2ba4fc3ee04bfa93b7e481b3d586 /build/jar_file_jni_generator.gypi | |
| parent | df14e42534f154e4d511936236779e4793e3b5d3 (diff) | |
| download | chromium_src-f773eb59fa48d6917845fd1300d598f71ff719c8.zip chromium_src-f773eb59fa48d6917845fd1300d598f71ff719c8.tar.gz chromium_src-f773eb59fa48d6917845fd1300d598f71ff719c8.tar.bz2 | |
Android: sync up latest JNI generator changes from downstream.
Quite a few changes were made downstream, keep them in sync:
- specify the #include files.
- inject the common DCHECKs for class and native pointers.
- inject the check exception call.
BUG=
Review URL: https://codereview.chromium.org/115103002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/jar_file_jni_generator.gypi')
| -rw-r--r-- | build/jar_file_jni_generator.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/jar_file_jni_generator.gypi b/build/jar_file_jni_generator.gypi index 2e1b084..dc43c49 100644 --- a/build/jar_file_jni_generator.gypi +++ b/build/jar_file_jni_generator.gypi @@ -22,6 +22,10 @@ { 'variables': { 'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py', + # A comma separated string of include files. + 'jni_generator_includes%': ( + 'base/android/jni_generator/jni_generator_helper.h' + ), }, 'actions': [ { @@ -46,6 +50,8 @@ '<(input_java_class)', '--output_dir', '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni', + '--includes', + '<(jni_generator_includes)', '--optimize_generation', '<(optimize_jni_generation)', ], |