From 417b8e4fe3238fbc33570c8b0600ca23c88aedca Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Tue, 7 Jul 2020 15:18:23 +0200 Subject: [PATCH] Fix style inconsistencies in Java bindings --- doc/BUILDING.rst | 4 ++-- native_client/java/jni/deepspeech.i | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/BUILDING.rst b/doc/BUILDING.rst index 3c20cb29..16c5734a 100644 --- a/doc/BUILDING.rst +++ b/doc/BUILDING.rst @@ -198,13 +198,13 @@ You can build the ``libdeepspeech.so`` using (ARMv7): .. code-block:: - bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=android --config=android_arm --define=runtime=tflite --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++11 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so + bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=android --config=android_arm --define=runtime=tflite --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++14 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so Or (ARM64): .. code-block:: - bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=android --config=android_arm64 --define=runtime=tflite --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++11 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so + bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=android --config=android_arm64 --define=runtime=tflite --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++14 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so Building ``libdeepspeech.aar`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/native_client/java/jni/deepspeech.i b/native_client/java/jni/deepspeech.i index c028714c..cd5a97a5 100644 --- a/native_client/java/jni/deepspeech.i +++ b/native_client/java/jni/deepspeech.i @@ -62,4 +62,13 @@ %rename ("%(strip:[DS_])s") ""; +// make struct members camel case to suit Java conventions +%rename ("%(camelcase)s", %$ismember) ""; + +// ignore automatically generated getTokens and getTranscripts since they don't +// do anything useful and we have already provided getToken(int i) and +// getTranscript(int i) above. +%ignore "Metadata::transcripts"; +%ignore "CandidateTranscript::tokens"; + %include "../deepspeech.h"