Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index da99331..6edc512 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -36,6 +36,7 @@
'jni_generator_includes%': (
'base/android/jni_generator/jni_generator_helper.h'
),
+ 'native_exports%': '',
},
'rules': [
{
@@ -61,6 +62,7 @@
'<(jni_generator_jarjar_file)',
'--ptr_type',
'<(jni_generator_ptr_type)',
+ '<(native_exports)',
],
'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,
@@ -81,4 +83,15 @@
# This target exports a hard dependency because it generates header
# files.
'hard_dependency': 1,
+ 'conditions': [
+ ['android_webview_build==1', {
+ 'variables': {
+ 'native_exports%': '--native_exports',
+ },
+ 'dependencies': [
+ '<(DEPTH)/build/android/android_exports.gyp:android_exports',
+ ],
+ }],
+ ],
}
+