Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Unified Diff: base/android/jni_generator/jni_generator.py

Issue 953523003: Make combined native/manual JNI registration work for clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/jni_generator/jni_generator.py
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 54fea6babfb2299c8d7714ef65edbdea348ea1f0..3182036cd00cdec530646638099282efba5af90b 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -1073,8 +1073,10 @@ static ${RETURN} ${NAME}(JNIEnv* env, ${PARAMS});
"""
if self.options.native_exports:
template_str += """
-__attribute__((visibility("default"), alias("${NAME}")))
-${RETURN} ${STUB_NAME}(JNIEnv* env, ${PARAMS});
+__attribute__((visibility("default")))
+${RETURN} ${STUB_NAME}(JNIEnv* env, ${PARAMS}) {
+ return ${NAME}(${PARAMS_IN_CALL});
+}
"""
template = Template(template_str)
params_in_call = []
« no previous file with comments | « no previous file | base/android/jni_generator/testNativeExportsOption.golden » ('j') | build/jar_file_jni_generator.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698