summaryrefslogtreecommitdiff
path: root/chromium/build/jni_generator.gypi
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/build/jni_generator.gypi
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/build/jni_generator.gypi')
-rw-r--r--chromium/build/jni_generator.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/build/jni_generator.gypi b/chromium/build/jni_generator.gypi
index 680a0eebbf6..a6c8364d44c 100644
--- a/chromium/build/jni_generator.gypi
+++ b/chromium/build/jni_generator.gypi
@@ -31,6 +31,7 @@
'variables': {
'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
'jni_generator_jarjar_file%': '',
+ 'jni_generator_ptr_type%': 'int',
},
'rules': [
{
@@ -52,6 +53,8 @@
'<(optimize_jni_generation)',
'--jarjar',
'<(jni_generator_jarjar_file)',
+ '--ptr_type',
+ '<(jni_generator_ptr_type)',
],
'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,