Update from https://crrev.com/318214

base/android/jni_generator/jni_generator.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Extracts native methods from a Java file and generates the JNI bindings.
 If you change this, please run and update the tests."""
 
 import collections
 import errno
@@ skipping 904 matching lines @@
           'METHOD_ID_VAR_NAME': called_by_native.method_id_var_name,
           'GET_METHOD_ID_IMPL': self.GetMethodIDImpl(called_by_native),
       }
       ret += [template.substitute(values)]
     return '\n'.join(ret)
 
   def GetRegisterNativesString(self):
     """Returns the code for RegisterNatives."""
     template = Template("""\
 ${REGISTER_NATIVES_SIGNATURE} {
-${EARLY_EXIT}${CLASSES}
+${EARLY_EXIT}
+${CLASSES}
 ${NATIVES}
 ${CALLED_BY_NATIVES}
   return true;
 }
 """)
     signature = 'static bool RegisterNativesImpl(JNIEnv* env'
     if self.init_native:
       signature += ', jclass clazz)'
     else:
       signature += ')'
@@ skipping 130 matching lines @@
       return template.substitute(values)
     else:
       return native.name
 
   def GetForwardDeclaration(self, native):
     template_str = """
 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 = []
     if not self.options.pure_native_methods:
       params_in_call = ['env', 'jcaller']
     params_in_call = ', '.join(params_in_call + [p.name for p in native.params])
 
     values = {'RETURN': JavaDataTypeToC(native.return_type),
               'NAME': native.name,
               'PARAMS': self.GetParamsInDeclaration(native),
@@ skipping 217 matching lines @@
       }
       ret += [template.substitute(values)]
 
     return '\n'.join(ret)
 
   def GetFindClasses(self):
     """Returns the imlementation of FindClass for all known classes."""
     if self.init_native:
       if self.options.native_exports:
         template = Template("""\
-    base::subtle::Release_Store(&g_${JAVA_CLASS}_clazz,
+  base::subtle::Release_Store(&g_${JAVA_CLASS}_clazz,
       static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));""")
       else:
         template = Template("""\
   g_${JAVA_CLASS}_clazz = static_cast<jclass>(env->NewWeakGlobalRef(clazz));""")
     else:
       if self.options.native_exports:
         return '\n'
       template = Template("""\
   g_${JAVA_CLASS}_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, k${JAVA_CLASS}ClassPath).obj()));""")
@@ skipping 219 matching lines @@
   GenerateJNIHeader(input_file, output_file, options)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))