Merge pull request #1710 from lissyx/tflite-engine

Add TFLite engine
2018-12-13 13:36:20 -05:00 · 2018-12-13 13:36:20 -05:00 · f69db729dc
commit f69db729dc
parent 4b11736191 672fad9a9b
70 changed files with 1835 additions and 75 deletions
--- a/native_client/Android.mk
+++ b/native_client/Android.mk
@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := deepspeech-prebuilt
+LOCAL_SRC_FILES := $(TFDIR)/bazel-bin/native_client/libdeepspeech.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION    := .cc .cxx .cpp
+LOCAL_MODULE           := deepspeech
+LOCAL_SRC_FILES        := client.cc
+LOCAL_SHARED_LIBRARIES := deepspeech-prebuilt
+LOCAL_LDFLAGS          := -Wl,--no-as-needed
+include $(BUILD_EXECUTABLE)
--- a/native_client/BUILD
+++ b/native_client/BUILD
@ -3,6 +3,9 @@
 load("@org_tensorflow//tensorflow:tensorflow.bzl",
     "tf_cc_shared_object", "if_cuda")

+load("@org_tensorflow//tensorflow/contrib/lite:build_def.bzl",
+     "tflite_copts", "tflite_linkopts")
+
 genrule(
    name = "ds_git_version",
    outs = ["ds_version.h"],
@ -55,47 +58,53 @@ tf_cc_shared_object(
           DECODER_SOURCES,
    # -Wno-sign-compare to silent a lot of warnings from tensorflow itself,
    # which makes it harder to see our own warnings
-    copts = ["-Wno-sign-compare", "-fvisibility=hidden"],
+    copts = ["-Wno-sign-compare", "-fvisibility=hidden"] + tflite_copts(),
    linkopts = select({
        "//tensorflow:darwin": [],
        "//tensorflow:linux_x86_64": LINUX_LINKOPTS,
        "//tensorflow:rpi3": LINUX_LINKOPTS + ["-l:libstdc++.a"],
        "//tensorflow:rpi3-armv8": LINUX_LINKOPTS + ["-l:libstdc++.a"],
-    }),
-    deps = [
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:direct_session",
-        "//third_party/eigen3",
-        #"//tensorflow/core:all_kernels",
-        ### => Trying to be more fine-grained
-        ### Use bin/ops_in_graph.py to list all the ops used by a frozen graph.
-        ### CPU only build, libdeepspeech.so file size reduced by ~50%
-        "//tensorflow/core/kernels:dense_update_ops",   # Assign
-        "//tensorflow/core/kernels:constant_op",        # Const
-        "//tensorflow/core/kernels:immutable_constant_op", # ImmutableConst
-        "//tensorflow/core/kernels:identity_op",        # Identity
-        "//tensorflow/core/kernels:softmax_op",         # Softmax
-        "//tensorflow/core/kernels:transpose_op",       # Transpose
-        "//tensorflow/core/kernels:reshape_op",         # Reshape
-        "//tensorflow/core/kernels:shape_ops",          # Shape
-        "//tensorflow/core/kernels:concat_op",          # ConcatV2
-        "//tensorflow/core/kernels:split_op",           # Split
-        "//tensorflow/core/kernels:variable_ops",       # VariableV2
-        "//tensorflow/core/kernels:relu_op",            # Relu
-        "//tensorflow/core/kernels:bias_op",            # BiasAdd
-        "//tensorflow/core/kernels:math",               # Range, MatMul
-        "//tensorflow/core/kernels:control_flow_ops",   # Enter
-        "//tensorflow/core/kernels:tile_ops",           # Tile
-        "//tensorflow/core/kernels:gather_op",          # Gather
-        "//tensorflow/contrib/rnn:lstm_ops_kernels",    # BlockLSTM
-        "//tensorflow/core/kernels:random_ops",         # RandomGammaGrad
-        "//tensorflow/core/kernels:pack_op",            # Pack
-        "//tensorflow/core/kernels:gather_nd_op",       # GatherNd
-        #### Needed by production model produced without "--use_seq_length False"
-        #"//tensorflow/core/kernels:logging_ops",         # Assert
-        #"//tensorflow/core/kernels:reverse_sequence_op", # ReverseSequence
-    ] + if_cuda([
-        "//tensorflow/core:core",
+        "//conditions:default": []
+    }) + tflite_linkopts(),
+    deps = select({
+        "//tensorflow:android": [
+            "//tensorflow/contrib/lite/kernels:builtin_ops",
+        ],
+        "//conditions:default": [
+            "//tensorflow/core:core_cpu",
+            "//tensorflow/core:direct_session",
+            "//third_party/eigen3",
+            #"//tensorflow/core:all_kernels",
+            ### => Trying to be more fine-grained
+            ### Use bin/ops_in_graph.py to list all the ops used by a frozen graph.
+            ### CPU only build, libdeepspeech.so file size reduced by ~50%
+            "//tensorflow/core/kernels:dense_update_ops",   # Assign
+            "//tensorflow/core/kernels:constant_op",        # Const
+            "//tensorflow/core/kernels:immutable_constant_op", # ImmutableConst
+            "//tensorflow/core/kernels:identity_op",        # Identity
+            "//tensorflow/core/kernels:softmax_op",         # Softmax
+            "//tensorflow/core/kernels:transpose_op",       # Transpose
+            "//tensorflow/core/kernels:reshape_op",         # Reshape
+            "//tensorflow/core/kernels:shape_ops",          # Shape
+            "//tensorflow/core/kernels:concat_op",          # ConcatV2
+            "//tensorflow/core/kernels:split_op",           # Split
+            "//tensorflow/core/kernels:variable_ops",       # VariableV2
+            "//tensorflow/core/kernels:relu_op",            # Relu
+            "//tensorflow/core/kernels:bias_op",            # BiasAdd
+            "//tensorflow/core/kernels:math",               # Range, MatMul
+            "//tensorflow/core/kernels:control_flow_ops",   # Enter
+            "//tensorflow/core/kernels:tile_ops",           # Tile
+            "//tensorflow/core/kernels:gather_op",          # Gather
+            "//tensorflow/contrib/rnn:lstm_ops_kernels",    # BlockLSTM
+            "//tensorflow/core/kernels:random_ops",         # RandomGammaGrad
+            "//tensorflow/core/kernels:pack_op",            # Pack
+            "//tensorflow/core/kernels:gather_nd_op",       # GatherNd
+            #### Needed by production model produced without "--use_seq_length False"
+            #"//tensorflow/core/kernels:logging_ops",         # Assert
+            #"//tensorflow/core/kernels:reverse_sequence_op", # ReverseSequence
+        ],
+    }) + if_cuda([
+            "//tensorflow/core:core",
    ]),
    includes = ["c_speech_features", "kiss_fft130"] + DECODER_INCLUDES,
    defines = ["KENLM_MAX_ORDER=6"],
--- a/native_client/README.md
+++ b/native_client/README.md
@ -90,6 +90,62 @@ cd ../DeepSpeech/native_client
 make deepspeech
 ```

+### Cross-building for RPi3 ARMv7 / LePotato ARM64
+
+We do support cross-compilation ; please refer to our `mozilla/tensorflow` fork, where we define the following `--config` flags:
+ - `--config=rpi3` and `--config=rpi3_opt` for Raspbian / ARMv7
+ - `--config=rpi3-armv8` and `--config=rpi3-armv8_opt` for ARMBian / ARM64
+
+So your command line for RPi3 / ARMv7 should look like:
+```
+bazel build --config=monolithic --config=rpi3 --config=rpi3_opt -c opt --copt=-O3 --copt=-fvisibility=hidden //native_client:libdeepspeech.so //native_client:generate_trie
+```
+
+And your command line for LePotato / ARM64 should look like:
+```
+bazel build --config=monolithic --config=rpi3-armv8 --config=rpi3-armv8_opt -c opt --copt=-O3 --copt=-fvisibility=hidden //native_client:libdeepspeech.so //native_client:generate_trie
+```
+
+While we test only on RPi3 Raspbian Stretch / LePotato ARMBian stretch, anything compatible with `armv7-a cortex-a53` / `armv8-a cortex-a53` should be fine.
+
+The `deepspeech` binary can also be cross-built, with `TARGET=rpi3` or `TARGET=rpi3-armv8`. This might require you to setup a system tree using the tool `multistrap` and the multitrap configuration files: `native_client/multistrap_armbian64_stretch.conf` and `native_client/multistrap_raspbian_stretch.conf`.
+The path of the system tree can be overridden from the default values defined in `definitions.mk` through `RASPBIAN` make variable.
+
+```
+cd ../DeepSpeech/native_client
+make TARGET=<system> deepspeech
+```
+
+### Android devices
+
+We have preliminary support for Android relying on TensorFlow Lite, with upcoming Java / JNI bindinds. For more details on how to experiment with those, please refer to `native_client/java/README.md`.
+
+Please refer to TensorFlow documentation on how to setup the environment to build for Android (SDK and NDK required).
+
+You can build the `libdeepspeech.so` using (ARMv7):
+
+```
+bazel build --config=monolithic --config=android --config=android_arm --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++11 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so
+```
+
+Or (ARM64):
+```
+bazel build --config=monolithic --config=android --config=android_arm64 --action_env ANDROID_NDK_API_LEVEL=21 --cxxopt=-std=c++11 --copt=-D_GLIBCXX_USE_C99 //native_client:libdeepspeech.so
+```
+
+Building the `deepspeech` binary will happen through `ndk-build` (ARMv7):
+
+```
+cd ../DeepSpeech/native_client
+$ANDROID_NDK_HOME/ndk-build APP_PLATFORM=android-21 APP_BUILD_SCRIPT=$(pwd)/Android.mk NDK_PROJECT_PATH=$(pwd) APP_STL=c++_shared TFDIR=$(pwd)/../../tensorflow/ TARGET_ARCH_ABI=armeabi-v7a
+```
+
+And (ARM64):
+```
+cd ../DeepSpeech/native_client
+$ANDROID_NDK_HOME/ndk-build APP_PLATFORM=android-21 APP_BUILD_SCRIPT=$(pwd)/Android.mk NDK_PROJECT_PATH=$(pwd) APP_STL=c++_shared TFDIR=$(pwd)/../../tensorflowx/ TARGET_ARCH_ABI=arm64-v8a 
+```
+
 ## Installing

 After building, the library files and binary can optionally be installed to a system path for ease of development. This is also a required step for bindings generation.
--- a/native_client/client.cc
+++ b/native_client/client.cc
@ -6,7 +6,9 @@
 #include <errno.h>
 #include <math.h>
 #include <string.h>
+#ifndef __ANDROID__
 #include <sox.h>
+#endif // __ANDROID__
 #include <time.h>
 #include <unistd.h>

@ -59,6 +61,7 @@ GetAudioBuffer(const char* path)
 {
  ds_audio_buffer res = {0};

+#ifndef __ANDROID__
  sox_format_t* input = sox_open_read(path, NULL, NULL, NULL);
  assert(input);

@ -147,6 +150,51 @@ GetAudioBuffer(const char* path)
  // Close sox handles
  sox_close(output);
  sox_close(input);
+#endif // __ANDROID__
+
+#ifdef __ANDROID__
+  // FIXME: Hack and support only 16kHz mono 16-bits PCM
+  FILE* wave = fopen(path, "r");
+
+  size_t rv;
+
+  unsigned short audio_format;
+  fseek(wave, 20, SEEK_SET); rv = fread(&audio_format, 2, 1, wave);
+  assert(rv == 2);
+
+  unsigned short num_channels;
+  fseek(wave, 22, SEEK_SET); rv = fread(&num_channels, 2, 1, wave);
+  assert(rv == 2);
+
+  unsigned int sample_rate;
+  fseek(wave, 24, SEEK_SET); rv = fread(&sample_rate, 4, 1, wave);
+  assert(rv == 2);
+
+  unsigned short bits_per_sample;
+  fseek(wave, 34, SEEK_SET); rv = fread(&bits_per_sample, 2, 1, wave);
+  assert(rv == 2);
+
+  assert(audio_format == 1); // 1 is PCM
+  assert(num_channels == 1); // MONO
+  assert(sample_rate == 16000); // 16000 Hz
+  assert(bits_per_sample == 16); // 16 bits per sample
+
+  fprintf(stderr, "audio_format=%d\n", audio_format);
+  fprintf(stderr, "num_channels=%d\n", num_channels);
+  fprintf(stderr, "sample_rate=%d\n", sample_rate);
+  fprintf(stderr, "bits_per_sample=%d\n", bits_per_sample);
+
+  fseek(wave, 40, SEEK_SET); rv = fread(&res.buffer_size, 4, 1, wave);
+  assert(rv == 2);
+  fprintf(stderr, "res.buffer_size=%ld\n", res.buffer_size);
+
+  fseek(wave, 44, SEEK_SET);
+  res.buffer = (char*)malloc(sizeof(char) * res.buffer_size);
+  rv = fread(res.buffer, sizeof(char), res.buffer_size, wave);
+  assert(rv == res.buffer_size);
+
+  fclose(wave);
+#endif // __ANDROID__

 #ifdef __APPLE__
  res.buffer_size = (size_t)(output->olength * 2);
@ -255,8 +303,10 @@ main(int argc, char **argv)
      break;
  }

+#ifndef __ANDROID__
  // Deinitialise and quit
  sox_quit();
+#endif // __ANDROID__

  DS_DestroyModel(ctx);

--- a/native_client/deepspeech.cc
+++ b/native_client/deepspeech.cc
@ -9,17 +9,35 @@
 #include "deepspeech.h"
 #include "alphabet.h"

+#ifndef USE_TFLITE
 #include "tensorflow/core/public/version.h"
+#endif // USE_TFLITE
+
 #include "native_client/ds_version.h"

-#include "tensorflow/core/public/session.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/util/memmapped_file_system.h"
+#ifndef USE_TFLITE
+  #include "tensorflow/core/public/session.h"
+  #include "tensorflow/core/platform/env.h"
+  #include "tensorflow/core/util/memmapped_file_system.h"
+#else // USE_TFLITE
+  #include "tensorflow/contrib/lite/model.h"
+  #include "tensorflow/contrib/lite/kernels/register.h"
+#endif // USE_TFLITE

 #include "c_speech_features.h"

 #include "ctcdecode/ctc_beam_search_decoder.h"

+#ifdef __ANDROID__
+#include <android/log.h>
+#define  LOG_TAG    "libdeepspeech"
+#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#else
+#define  LOGD(...)
+#define  LOGE(...)
+#endif // __ANDROID__
+
 //TODO: infer batch size from model/use dynamic batch size
 constexpr unsigned int BATCH_SIZE = 1;

@ -51,7 +69,11 @@ std::array<float, WINDOW_SIZE> calc_hamming_window() {

 std::array<float, WINDOW_SIZE> hamming_window = calc_hamming_window();

-using namespace tensorflow;
+#ifndef USE_TFLITE
+  using namespace tensorflow;
+#else
+  using namespace tflite;
+#endif

 using std::vector;

@ -104,9 +126,14 @@ struct StreamingState {
 };

 struct ModelState {
+#ifndef USE_TFLITE
  MemmappedEnv* mmap_env;
  Session* session;
  GraphDef graph_def;
+#else // USE_TFLITE
+  std::unique_ptr<Interpreter> interpreter;
+  std::unique_ptr<FlatBufferModel> fbmodel;
+#endif // USE_TFLITE
  unsigned int ncep;
  unsigned int ncontext;
  Alphabet* alphabet;
@ -116,6 +143,12 @@ struct ModelState {
  unsigned int mfcc_feats_per_timestep;
  unsigned int n_context;

+#ifdef USE_TFLITE
+  size_t previous_state_size;
+  std::unique_ptr<float[]> previous_state_c_;
+  std::unique_ptr<float[]> previous_state_h_;
+#endif
+
  ModelState();
  ~ModelState();

@ -144,8 +177,14 @@ struct ModelState {
 };

 ModelState::ModelState()
-  : mmap_env(nullptr)
+  :
+#ifndef USE_TFLITE
+    mmap_env(nullptr)
  , session(nullptr)
+#else // USE_TFLITE
+    interpreter(nullptr)
+  , fbmodel(nullptr)
+#endif // USE_TFLITE
  , ncep(0)
  , ncontext(0)
  , alphabet(nullptr)
@ -154,20 +193,27 @@ ModelState::ModelState()
  , n_steps(-1)
  , mfcc_feats_per_timestep(-1)
  , n_context(-1)
+#ifdef USE_TFLITE
+  , previous_state_size(0)
+  , previous_state_c_(nullptr)
+  , previous_state_h_(nullptr)
+#endif
 {
 }

 ModelState::~ModelState()
 {
+#ifndef USE_TFLITE
  if (session) {
    Status status = session->Close();
    if (!status.ok()) {
      std::cerr << "Error closing TensorFlow session: " << status << std::endl;
    }
  }
+  delete mmap_env;
+#endif // USE_TFLITE

  delete scorer;
-  delete mmap_env;
  delete alphabet;
 }

@ -293,6 +339,7 @@ ModelState::infer(const float* aMfcc, unsigned int n_frames, vector<float>& logi
 {
  const size_t num_classes = alphabet->GetSize() + 1; // +1 for blank

+#ifndef USE_TFLITE
  Tensor input(DT_FLOAT, TensorShape({BATCH_SIZE, n_steps, 2*n_context+1, MFCC_FEATURES}));

  auto input_mapped = input.flat<float>();
@ -322,6 +369,41 @@ ModelState::infer(const float* aMfcc, unsigned int n_frames, vector<float>& logi
  for (int t = 0; t < n_frames * BATCH_SIZE * num_classes; ++t) {
    logits_output.push_back(logits_mapped(t));
  }
+#else // USE_TFLITE
+  // Feeding input_node
+  float* input_node = interpreter->typed_tensor<float>(interpreter->inputs()[0]);
+  {
+    int i;
+    for (i = 0; i < n_frames*mfcc_feats_per_timestep; ++i) {
+      input_node[i] = aMfcc[i];
+    }
+    for (; i < n_steps*mfcc_feats_per_timestep; ++i) {
+      input_node[i] = 0;
+    }
+  }
+
+  assert(previous_state_size > 0);
+
+  // Feeding previous_state_c, previous_state_h
+  memcpy(interpreter->typed_tensor<float>(interpreter->inputs()[1]), previous_state_c_.get(), sizeof(float) * previous_state_size);
+  memcpy(interpreter->typed_tensor<float>(interpreter->inputs()[2]), previous_state_h_.get(), sizeof(float) * previous_state_size);
+
+  TfLiteStatus status = interpreter->Invoke();
+  if (status != kTfLiteOk) {
+    std::cerr << "Error running session: " << status << "\n";
+    return;
+  }
+
+  float* outputs = interpreter->typed_tensor<float>(interpreter->outputs()[0]);
+
+  // The CTCDecoder works with log-probs.
+  for (int t = 0; t < n_frames * BATCH_SIZE * num_classes; ++t) {
+    logits_output.push_back(outputs[t]);
+  }
+
+  memcpy(previous_state_c_.get(), interpreter->typed_tensor<float>(interpreter->outputs()[1]), sizeof(float) * previous_state_size);
+  memcpy(previous_state_h_.get(), interpreter->typed_tensor<float>(interpreter->outputs()[2]), sizeof(float) * previous_state_size);
+#endif // USE_TFLITE
 }

 char*
@ -352,7 +434,9 @@ DS_CreateModel(const char* aModelPath,
               ModelState** retval)
 {
  std::unique_ptr<ModelState> model(new ModelState());
+#ifndef USE_TFLITE
  model->mmap_env   = new MemmappedEnv(Env::Default());
+#endif // USE_TFLITE
  model->ncep       = aNCep;
  model->ncontext   = aNContext;
  model->alphabet   = new Alphabet(aAlphabetConfigPath);
@ -364,9 +448,14 @@ DS_CreateModel(const char* aModelPath,

  if (!aModelPath || strlen(aModelPath) < 1) {
    std::cerr << "No model specified, cannot continue." << std::endl;
+#ifndef USE_TFLITE
    return error::INVALID_ARGUMENT;
+#else // USE_TFLITE
+    return EINVAL;
+#endif // USE_TFLITE
  }

+#ifndef USE_TFLITE
  Status status;
  SessionOptions options;

@ -448,6 +537,62 @@ DS_CreateModel(const char* aModelPath,

  *retval = model.release();
  return tensorflow::error::OK;
+#else // USE_TFLITE
+  TfLiteStatus status;
+
+  model->fbmodel = tflite::FlatBufferModel::BuildFromFile(aModelPath);
+  if (status != kTfLiteOk) {
+    std::cerr << status << std::endl;
+    return status;
+  }
+
+
+  tflite::ops::builtin::BuiltinOpResolver resolver;
+  status = tflite::InterpreterBuilder(*model->fbmodel, resolver)(&model->interpreter);
+  if (status != kTfLiteOk) {
+    std::cerr << status << std::endl;
+    return status;
+  }
+
+  model->interpreter->AllocateTensors();
+  model->interpreter->SetNumThreads(4);
+
+  TfLiteIntArray* dims_input_node = model->interpreter->tensor(model->interpreter->inputs()[0])->dims;
+
+  model->n_steps = dims_input_node->data[1];
+  model->n_context = (dims_input_node->data[2] - 1 ) / 2;
+  model->mfcc_feats_per_timestep = dims_input_node->data[2] * dims_input_node->data[3];
+
+  TfLiteIntArray* dims_logits = model->interpreter->tensor(model->interpreter->outputs()[0])->dims;
+  const int final_dim_size = dims_logits->data[1] - 1;
+  if (final_dim_size != model->alphabet->GetSize()) {
+    std::cerr << "Error: Alphabet size does not match loaded model: alphabet "
+              << "has size " << model->alphabet->GetSize()
+              << ", but model has " << final_dim_size
+              << " classes in its output. Make sure you're passing an alphabet "
+              << "file with the same size as the one used for training."
+              << std::endl;
+    return EINVAL;
+  }
+
+  const int previous_state_c_id = model->interpreter->inputs()[1];
+  const int previous_state_h_id = model->interpreter->inputs()[2];
+
+  TfLiteIntArray* dims_c = model->interpreter->tensor(previous_state_c_id)->dims;
+  TfLiteIntArray* dims_h = model->interpreter->tensor(previous_state_h_id)->dims;
+  assert(dims_c->data[1] == dims_h->data[1]);
+
+  model->previous_state_size = dims_c->data[1];
+  model->previous_state_c_.reset(new float[model->previous_state_size]());
+  model->previous_state_h_.reset(new float[model->previous_state_size]());
+
+  // Set initial values for previous_state_c and previous_state_h
+  memset(model->previous_state_c_.get(), 0, sizeof(float) * model->previous_state_size);
+  memset(model->previous_state_h_.get(), 0, sizeof(float) * model->previous_state_size);
+
+  *retval = model.release();
+  return kTfLiteOk;
+#endif // USE_TFLITE
 }

 void
@ -483,7 +628,11 @@ DS_SpeechToText(ModelState* aCtx,
 {
  StreamingState* ctx;
  int status = DS_SetupStream(aCtx, 0, aSampleRate, &ctx);
+#ifndef USE_TFLITE
  if (status != tensorflow::error::OK) {
+#else // USE_TFLITE
+  if (status != kTfLiteOk) {
+#endif // USE_TFLITE
    return nullptr;
  }
  DS_FeedAudioContent(ctx, aBuffer, aBufferSize);
@ -498,16 +647,22 @@ DS_SetupStream(ModelState* aCtx,
 {
  *retval = nullptr;

+#ifndef USE_TFLITE
  Status status = aCtx->session->Run({}, {}, {"initialize_state"}, nullptr);
  if (!status.ok()) {
    std::cerr << "Error running session: " << status << std::endl;
    return status.code();
  }
+#endif // USE_TFLITE

  std::unique_ptr<StreamingState> ctx(new StreamingState());
  if (!ctx) {
    std::cerr << "Could not allocate streaming state." << std::endl;
+#ifndef USE_TFLITE
    return status.code();
+#else // USE_TFLITE
+    return ENOMEM;
+#endif // USE_TFLITE
  }

  const size_t num_classes = aCtx->alphabet->GetSize() + 1; // +1 for blank
@ -528,7 +683,11 @@ DS_SetupStream(ModelState* aCtx,
  ctx->model = aCtx;

  *retval = ctx.release();
+#ifndef USE_TFLITE
  return tensorflow::error::OK;
+#else // USE_TFLITE
+  return kTfLiteOk;
+#endif // USE_TFLITE
 }

 void
@ -629,7 +788,12 @@ DS_AudioToInputVector(const short* aBuffer,

 void
 DS_PrintVersions() {
+#ifndef __ANDROID__
  std::cerr << "TensorFlow: " << tf_git_version() << std::endl;
  std::cerr << "DeepSpeech: " << ds_git_version() << std::endl;
+#else
+  LOGE("DeepSpeech: %s", ds_git_version());
+  LOGD("DeepSpeech: %s", ds_git_version());
+#endif
 }

--- a/native_client/deepspeech.h
+++ b/native_client/deepspeech.h
@ -1,6 +1,10 @@
 #ifndef DEEPSPEECH_H
 #define DEEPSPEECH_H

+#ifdef __ANDROID__
+#define USE_TFLITE
+#endif
+
 #ifndef SWIG
 #define DEEPSPEECH_EXPORT __attribute__ ((visibility("default")))
 #else
--- a/native_client/java/.gitignore
+++ b/native_client/java/.gitignore
@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches/build_file_checksums.ser
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
--- a/native_client/java/.idea/codeStyles/Project.xml
+++ b/native_client/java/.idea/codeStyles/Project.xml
@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
--- a/native_client/java/.idea/gradle.xml
+++ b/native_client/java/.idea/gradle.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/native_client/java/.idea/misc.xml
+++ b/native_client/java/.idea/misc.xml
@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="7">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="6">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/native_client/java/.idea/runConfigurations.xml
+++ b/native_client/java/.idea/runConfigurations.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/native_client/java/Makefile
+++ b/native_client/java/Makefile
@ -0,0 +1,19 @@
+.PHONY: clean apk-clean
+
+include ../definitions.mk
+
+LIBDEEPSPEECH_SO ?= ${TFDIR}/bazel-bin/native_client/libdeepspeech.so
+
+all: apk
+
+clean: apk-clean
+	rm -rf *.java jni/deepspeech_wrap.cpp
+
+apk-clean:
+	./gradlew clean
+
+apk: apk-clean bindings
+	LIBDEEPSPEECH_SO=$(LIBDEEPSPEECH_SO) ./gradlew build
+
+bindings: clean
+	swig -c++ -java -package deepspeech.mozilla.org.deepspeech -outdir app/src/main/java/deepspeech/mozilla/org/deepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i 
--- a/native_client/java/README.md
+++ b/native_client/java/README.md
@ -0,0 +1,32 @@
+DeepSpeech Java / Android bindings
+==================================
+
+This is still preliminary work. Please refer to `native_client/README.md` for
+building `libdeepspeech.so` and `deepspeech` binary for Android on ARMv7 and
+ARM64 arch.
+
+Running `deepspeech` via adb
+============================
+You should use `adb push` to send data to device, please refer to Android
+documentation on how to use that.
+
+Please push DeepSpeech data to `/sdcard/deepspeech/`, including:
+ - `output_graph.tflite` which is the TF Lite model
+ - `alphabet.txt`
+ - `lm.binary` and `trie` files, if you want to use the language model ; please
+   be aware that too big language model will make the device run out of memory
+
+Then, push binaries from `native_client.tar.xz` to `/data/local/tmp/ds`:
+ - `deepspeech`
+ - `libdeepspeech.so`
+ - `libc++_shared.so`
+
+You should then be able to run as usual, using a shell from `adb shell`:
+```
+user@device$ cd /data/local/tmp/ds/
+user@device$ LD_LIBRARY_PATH=$(pwd)/ ./deepspeech [...]
+```
+
+Please note that Android linker does not support `rpath` so you have to set
+`LD_LIBRARY_PATH`. Properly wrapped / packaged bindings does embed the library
+at a place the linker knows where to search, so Android apps will be fine.
--- a/native_client/java/app/.gitignore
+++ b/native_client/java/app/.gitignore
@ -0,0 +1 @@
+/build
--- a/native_client/java/app/CMakeLists.txt
+++ b/native_client/java/app/CMakeLists.txt
@ -0,0 +1,58 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+             deepspeech-jni
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             ../jni/deepspeech_wrap.cpp )
+
+add_library( deepspeech-lib
+             SHARED
+             IMPORTED )
+
+set_target_properties( deepspeech-lib
+        PROPERTIES IMPORTED_LOCATION $ENV{LIBDEEPSPEECH_SO} )
+
+add_custom_command( TARGET deepspeech-jni POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+        $ENV{LIBDEEPSPEECH_SO}
+        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libdeepspeech.so )
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+                       deepspeech-jni
+
+                       deepspeech-lib
+
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       ${log-lib} )
--- a/native_client/java/app/build.gradle
+++ b/native_client/java/app/build.gradle
@ -0,0 +1,41 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "deepspeech.mozilla.org.deepspeech"
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+        externalNativeBuild {
+            cmake {
+                cppFlags ""
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
--- a/native_client/java/app/proguard-rules.pro
+++ b/native_client/java/app/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/native_client/java/app/src/androidTest/java/deepspeech/mozilla/org/deepspeech/ExampleInstrumentedTest.java
+++ b/native_client/java/app/src/androidTest/java/deepspeech/mozilla/org/deepspeech/ExampleInstrumentedTest.java
@ -0,0 +1,26 @@
+package deepspeech.mozilla.org.deepspeech;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("deepspeech.mozilla.org.deepspeech", appContext.getPackageName());
+    }
+}
--- a/native_client/java/app/src/main/AndroidManifest.xml
+++ b/native_client/java/app/src/main/AndroidManifest.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="deepspeech.mozilla.org.deepspeech">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".DeepSpeechActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+</manifest>
--- a/native_client/java/app/src/main/cpp/native-lib.cpp
+++ b/native_client/java/app/src/main/cpp/native-lib.cpp
@ -0,0 +1,10 @@
+#include <jni.h>
+#include <string>
+
+extern "C" JNIEXPORT jstring JNICALL
+Java_deepspeech_mozilla_org_deepspeech_DeepSpeechActivity_stringFromJNI(
+        JNIEnv* env,
+        jobject /* this */) {
+    std::string hello = "Hello from C++";
+    return env->NewStringUTF(hello.c_str());
+}
--- a/native_client/java/app/src/main/java/deepspeech/mozilla/org/deepspeech/DeepSpeechActivity.java
+++ b/native_client/java/app/src/main/java/deepspeech/mozilla/org/deepspeech/DeepSpeechActivity.java
@ -0,0 +1,177 @@
+package deepspeech.mozilla.org.deepspeech;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import android.view.View;
+import android.widget.TextView;
+import android.widget.EditText;
+import android.widget.Button;
+
+import android.media.MediaPlayer;
+
+import java.io.RandomAccessFile;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.nio.ByteBuffer;
+
+public class DeepSpeechActivity extends AppCompatActivity {
+
+    // Used to load the 'native-lib' library on application startup.
+    static {
+        System.loadLibrary("deepspeech-jni");
+        System.loadLibrary("deepspeech");
+    }
+
+    Model _m = null;
+
+    EditText _tfliteModel;
+    EditText _alphabet;
+    EditText _audioFile;
+
+    TextView _decodedString;
+    TextView _tfliteStatus;
+
+    Button _startInference;
+
+    final int N_CEP = 26;
+    final int N_CONTEXT = 9;
+    final int BEAM_WIDTH = 50;
+    final float LM_WEIGHT = 1.50f;
+    final float VALID_WORD_COUNT_WEIGHT = 2.10f;
+
+    private char readLEChar(RandomAccessFile f) throws IOException {
+        byte b1 = f.readByte();
+        byte b2 = f.readByte();
+        return (char)((b2 << 8) | b1);
+    }
+
+    private int readLEInt(RandomAccessFile f) throws IOException {
+        byte b1 = f.readByte();
+        byte b2 = f.readByte();
+        byte b3 = f.readByte();
+        byte b4 = f.readByte();
+        return (int)((b1 & 0xFF) | (b2 & 0xFF) << 8 | (b3 & 0xFF) << 16 | (b4 & 0xFF) << 24);
+    }
+
+    private void newModel(String tfliteModel, String alphabet) {
+        this._tfliteStatus.setText("Creating model");
+        if (this._m == null) {
+            this._m = new Model(tfliteModel, N_CEP, N_CONTEXT, alphabet, BEAM_WIDTH);
+        }
+    }
+
+    private void doInference(String audioFile) {
+        long inferenceExecTime = 0;
+
+        this._startInference.setEnabled(false);
+
+        this.newModel(this._tfliteModel.getText().toString(), this._alphabet.getText().toString());
+
+        this._tfliteStatus.setText("Extracting audio features ...");
+
+        try {
+            RandomAccessFile wave = new RandomAccessFile(audioFile, "r");
+
+            wave.seek(20); char audioFormat = this.readLEChar(wave);
+            assert (audioFormat == 1); // 1 is PCM
+            // tv_audioFormat.setText("audioFormat=" + (audioFormat == 1 ? "PCM" : "!PCM"));
+
+            wave.seek(22); char numChannels = this.readLEChar(wave);
+            assert (numChannels == 1); // MONO
+            // tv_numChannels.setText("numChannels=" + (numChannels == 1 ? "MONO" : "!MONO"));
+
+            wave.seek(24); int sampleRate = this.readLEInt(wave);
+            assert (sampleRate == 16000); // 16000 Hz
+            // tv_sampleRate.setText("sampleRate=" + (sampleRate == 16000 ? "16kHz" : "!16kHz"));
+
+            wave.seek(34); char bitsPerSample = this.readLEChar(wave);
+            assert (bitsPerSample == 16); // 16 bits per sample
+            // tv_bitsPerSample.setText("bitsPerSample=" + (bitsPerSample == 16 ? "16-bits" : "!16-bits" ));
+
+            wave.seek(40); int bufferSize = this.readLEInt(wave);
+            assert (bufferSize > 0);
+            // tv_bufferSize.setText("bufferSize=" + bufferSize);
+
+            wave.seek(44);
+            byte[] bytes = new byte[bufferSize];
+            wave.readFully(bytes);
+
+            short[] shorts = new short[bytes.length/2];
+            // to turn bytes to shorts as either big endian or little endian.
+            ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer().get(shorts);
+
+            this._tfliteStatus.setText("Running inference ...");
+
+            long inferenceStartTime = System.currentTimeMillis();
+
+            String decoded = this._m.stt(shorts, shorts.length, sampleRate);
+
+            inferenceExecTime = System.currentTimeMillis() - inferenceStartTime;
+
+            this._decodedString.setText(decoded);
+
+        } catch (FileNotFoundException ex) {
+
+        } catch (IOException ex) {
+
+        } finally {
+
+        }
+
+        this._tfliteStatus.setText("Finished! Took " + inferenceExecTime + "ms");
+
+        this._startInference.setEnabled(true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_deep_speech);
+
+        this._decodedString = (TextView) findViewById(R.id.decodedString);
+        this._tfliteStatus = (TextView) findViewById(R.id.tfliteStatus);
+
+        this._tfliteModel   = (EditText) findViewById(R.id.tfliteModel);
+        this._alphabet      = (EditText) findViewById(R.id.alphabet);
+        this._audioFile     = (EditText) findViewById(R.id.audioFile);
+
+        this._tfliteModel.setText("/sdcard/deepspeech/output_graph.tflite");
+        this._tfliteStatus.setText("Ready, waiting ...");
+
+        this._alphabet.setText("/sdcard/deepspeech/alphabet.txt");
+        this._audioFile.setText("/sdcard/deepspeech/audio.wav");
+
+        this._startInference = (Button) findViewById(R.id.btnStartInference);
+    }
+
+    public void onClick_inference_handler(View v) {
+        this.playAudioFile();
+        this.doInference(this._audioFile.getText().toString());
+    }
+
+    public void playAudioFile() {
+        try {
+            MediaPlayer mediaPlayer = new  MediaPlayer();
+            mediaPlayer.setDataSource(this._audioFile.getText().toString());
+            mediaPlayer.prepare();
+            mediaPlayer.start();
+        } catch (IOException ex) {
+
+        }
+    }
+
+    public void onClick_audio_handler(View v) {
+        this.playAudioFile();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (this._m != null) {
+            this._m.destroyModel();
+        }
+    }
+}
--- a/native_client/java/app/src/main/java/deepspeech/mozilla/org/deepspeech/Model.java
+++ b/native_client/java/app/src/main/java/deepspeech/mozilla/org/deepspeech/Model.java
@ -0,0 +1,44 @@
+package deepspeech.mozilla.org.deepspeech;
+
+public class Model {
+
+    // FIXME: We should have something better than those SWIGTYPE_*
+    SWIGTYPE_p_p_ModelState _mspp;
+    SWIGTYPE_p_ModelState   _msp;
+
+    public Model(String modelPath, int n_cep, int n_context, String alphabetPath, int beam_width) {
+        this._mspp = impl.new_modelstatep();
+        impl.CreateModel(modelPath, n_cep, n_context, alphabetPath, beam_width, this._mspp);
+        this._msp  = impl.modelstatep_value(this._mspp);
+    }
+
+    public void destroyModel() {
+        impl.DestroyModel(this._msp);
+    }
+
+    public void enableDecoderWihLM(String alphabet, String lm, String trie, float lm_weight, float valid_word_count_weight) {
+        impl.EnableDecoderWithLM(this._msp, alphabet, lm, trie, lm_weight, valid_word_count_weight);
+    }
+
+    public String stt(short[] buffer, int buffer_size, int sample_rate) {
+        return impl.SpeechToText(this._msp, buffer, buffer_size, sample_rate);
+    }
+
+    public SWIGTYPE_p_StreamingState setupStream(int prealloc_frames, int sample_rate) {
+        SWIGTYPE_p_p_StreamingState ssp = impl.new_streamingstatep();
+        impl.SetupStream(this._msp, prealloc_frames, sample_rate, ssp);
+        return impl.streamingstatep_value(ssp);
+    }
+
+    public void feedAudioContent(SWIGTYPE_p_StreamingState ctx, short[] buffer, int buffer_size) {
+        impl.FeedAudioContent(ctx, buffer, buffer_size);
+    }
+
+    public String intermediateDecode(SWIGTYPE_p_StreamingState ctx) {
+        return impl.IntermediateDecode(ctx);
+    }
+
+    public String finishStream(SWIGTYPE_p_StreamingState ctx) {
+        return impl.FinishStream(ctx);
+    }
+}
--- a/native_client/java/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/native_client/java/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/native_client/java/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/native_client/java/app/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/native_client/java/app/src/main/res/layout/activity_deep_speech.xml
+++ b/native_client/java/app/src/main/res/layout/activity_deep_speech.xml
@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".DeepSpeechActivity">
+
+    <!--
+    <TextView
+        android:id="@+id/audioFormat"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/numChannels"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/audioFormat" />
+
+    <TextView
+        android:id="@+id/sampleRate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/numChannels" />
+
+    <TextView
+        android:id="@+id/bitsPerSample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/sampleRate" />
+
+    <TextView
+        android:id="@+id/bufferSize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/bitsPerSample" />
+        -->
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="32dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintGuide_end="491dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/lblTfliteModel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Model file" />
+
+            <EditText
+                android:id="@+id/tfliteModel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/lblAlphabet"
+                android:layout_width="263dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Alphabet" />
+
+            <EditText
+                android:id="@+id/alphabet"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/lblAudioFile"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Audio file" />
+
+            <EditText
+                android:id="@+id/audioFile"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </LinearLayout>
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@android:dimen/app_icon_size" />
+
+        <TextView
+            android:id="@+id/tfliteStatus"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello World!"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@android:dimen/app_icon_size" />
+
+        <TextView
+            android:id="@+id/decodedString"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello World!"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@android:dimen/app_icon_size" />
+
+        <Button
+            android:id="@+id/btnStartInference"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Run inference!"
+            android:onClick="onClick_inference_handler" />
+
+    <!--
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@android:dimen/app_icon_size" />
+
+        <Button
+            android:id="@+id/btnPlayAudioFile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Listen to audio"
+            android:onClick="onClick_audio_handler" />
+    -->
+
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
--- a/native_client/java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/native_client/java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/native_client/java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/native_client/java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/native_client/java/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/native_client/java/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/native_client/java/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/native_client/java/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/native_client/java/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/native_client/java/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/native_client/java/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/native_client/java/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/native_client/java/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/native_client/java/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/native_client/java/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/native_client/java/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/native_client/java/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/native_client/java/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/native_client/java/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/native_client/java/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/native_client/java/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/native_client/java/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/native_client/java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/native_client/java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/native_client/java/app/src/main/res/values/colors.xml
+++ b/native_client/java/app/src/main/res/values/colors.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
--- a/native_client/java/app/src/main/res/values/strings.xml
+++ b/native_client/java/app/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">DeepSpeech</string>
+</resources>
--- a/native_client/java/app/src/main/res/values/styles.xml
+++ b/native_client/java/app/src/main/res/values/styles.xml
@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
--- a/native_client/java/app/src/test/java/deepspeech/mozilla/org/deepspeech/ExampleUnitTest.java
+++ b/native_client/java/app/src/test/java/deepspeech/mozilla/org/deepspeech/ExampleUnitTest.java
@ -0,0 +1,17 @@
+package deepspeech.mozilla.org.deepspeech;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
--- a/native_client/java/build.gradle
+++ b/native_client/java/build.gradle
@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
--- a/native_client/java/gradle.properties
+++ b/native_client/java/gradle.properties
@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+
--- a/native_client/java/gradle/wrapper/gradle-wrapper.jar
+++ b/native_client/java/gradle/wrapper/gradle-wrapper.jar
--- a/native_client/java/gradle/wrapper/gradle-wrapper.properties
+++ b/native_client/java/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/native_client/java/gradlew
+++ b/native_client/java/gradlew
@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
--- a/native_client/java/gradlew.bat
+++ b/native_client/java/gradlew.bat
@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/native_client/java/jni/deepspeech.i
+++ b/native_client/java/jni/deepspeech.i
@ -0,0 +1,20 @@
+%module impl
+
+%{
+#define SWIG_FILE_WITH_INIT
+#include "../../deepspeech.h"
+%}
+
+%include "typemaps.i"
+
+%include "arrays_java.i"
+// apply to DS_FeedAudioContent and DS_SpeechToText
+%apply short[] { short* };
+
+%include "cpointer.i"
+%pointer_functions(ModelState*, modelstatep);
+%pointer_functions(StreamingState*, streamingstatep);
+
+%rename ("%(strip:[DS_])s") "";
+
+%include "../deepspeech.h"
--- a/native_client/java/settings.gradle
+++ b/native_client/java/settings.gradle
@ -0,0 +1 @@
+include ':app'
--- a/native_client/kenlm/README.mozilla
+++ b/native_client/kenlm/README.mozilla
@ -10,3 +10,19 @@ rm -rf windows include lm/filter lm/builder util/stream util/getopt.* python

 This was done in order to ensure uniqueness of double_conversion:
 git grep 'double_conversion' | cut -d':' -f1 | sort | uniq | xargs sed -ri 's/double_conversion/kenlm_double_conversion/g'
+
+Please apply this patch to be able to build on Android:
+diff --git a/native_client/kenlm/util/file.cc b/native_client/kenlm/util/file.cc
+index d53dc0a..b5e36b2 100644
+--- a/native_client/kenlm/util/file.cc
+++ b/native_client/kenlm/util/file.cc
+@@ -540,7 +540,7 @@ std::string DefaultTempDirectory() {
+   const char *const vars[] = {"TMPDIR", "TMP", "TEMPDIR", "TEMP", 0};
+   for (int i=0; vars[i]; ++i) {
+     char *val =
+-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2,17)
+       secure_getenv
+ #else // __GLIBC_PREREQ
+
--- a/native_client/kenlm/util/file.cc
+++ b/native_client/kenlm/util/file.cc
@ -540,7 +540,7 @@ std::string DefaultTempDirectory() {
  const char *const vars[] = {"TMPDIR", "TMP", "TEMPDIR", "TEMP", 0};
  for (int i=0; vars[i]; ++i) {
    char *val =
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) && defined(__GLIBC_PREREQ)
 #if __GLIBC_PREREQ(2,17)
      secure_getenv
 #else // __GLIBC_PREREQ
--- a/taskcluster/android-arm64-cpu-opt.yml
+++ b/taskcluster/android-arm64-cpu-opt.yml
@ -0,0 +1,21 @@
+build:
+  template_file: linux-opt-base.tyml
+  routes:
+    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.android-arm64"
+    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.android-arm64"
+    - "index.project.deepspeech.deepspeech.native_client.android-arm64.${event.head.sha}"
+    - "notify.irc-channel.${notifications.irc}.on-exception"
+    - "notify.irc-channel.${notifications.irc}.on-failed"
+  system_setup:
+    >
+      ${swig.packages.install_script}
+  system_config:
+    >
+      ${swig.patch_nodejs.linux}
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.android-arm64/artifacts/public/home.tar.xz"
+  scripts:
+    build: "taskcluster/android-build.sh arm64-v8a"
+    package: "taskcluster/android-package.sh arm64-v8a"
+  metadata:
+    name: "DeepSpeech Android ARM64"
+    description: "Building DeepSpeech for Android ARM64, optimized version"
--- a/taskcluster/android-armv7-cpu-opt.yml
+++ b/taskcluster/android-armv7-cpu-opt.yml
@ -0,0 +1,21 @@
+build:
+  template_file: linux-opt-base.tyml
+  routes:
+    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.android-armv7"
+    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.android-armv7"
+    - "index.project.deepspeech.deepspeech.native_client.android-armv7.${event.head.sha}"
+    - "notify.irc-channel.${notifications.irc}.on-exception"
+    - "notify.irc-channel.${notifications.irc}.on-failed"
+  system_setup:
+    >
+      ${swig.packages.install_script}
+  system_config:
+    >
+      ${swig.patch_nodejs.linux}
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.android-armv7/artifacts/public/home.tar.xz"
+  scripts:
+    build: "taskcluster/android-build.sh armeabi-v7a"
+    package: "taskcluster/android-package.sh armeabi-v7a"
+  metadata:
+    name: "DeepSpeech Android ARMv7"
+    description: "Building DeepSpeech for Android ARMv7, optimized version"
--- a/taskcluster/android-build.sh
+++ b/taskcluster/android-build.sh
@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -xe
+
+arm_flavor=$1
+
+source $(dirname "$0")/../tc-tests-utils.sh
+
+source ${DS_ROOT_TASK}/DeepSpeech/tf/tc-vars.sh
+
+BAZEL_TARGETS="
+//native_client:libdeepspeech.so
+"
+
+if [ "${arm_flavor}" = "armeabi-v7a" ]; then
+    LOCAL_ANDROID_FLAGS="${BAZEL_ANDROID_ARM_FLAGS}"
+fi
+
+if [ "${arm_flavor}" = "arm64-v8a" ]; then
+    LOCAL_ANDROID_FLAGS="${BAZEL_ANDROID_ARM64_FLAGS}"
+fi
+
+BAZEL_BUILD_FLAGS="${LOCAL_ANDROID_FLAGS} ${BAZEL_EXTRA_FLAGS}"
+BAZEL_ENV_FLAGS="TF_NEED_CUDA=0"
+SYSTEM_TARGET=
+SYSTEM_RASPBIAN=
+
+do_bazel_build
+
+do_deepspeech_ndk_build "${arm_flavor}"
--- a/taskcluster/android-package.sh
+++ b/taskcluster/android-package.sh
@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -xe
+
+arm_flavor=$1
+
+source $(dirname "$0")/../tc-tests-utils.sh
+
+mkdir -p ${TASKCLUSTER_ARTIFACTS} || true
+
+cp ${DS_ROOT_TASK}/DeepSpeech/tf/bazel*.log ${TASKCLUSTER_ARTIFACTS}/
+
+package_native_client_ndk "native_client.tar.xz" "${arm_flavor}"
--- a/taskcluster/darwin-amd64-cpu-opt.yml
+++ b/taskcluster/darwin-amd64-cpu-opt.yml
@ -6,7 +6,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.osx.${event.head.sha}"
    - "notify.irc-channel.${notifications.irc}.on-exception"
    - "notify.irc-channel.${notifications.irc}.on-failed"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.osx/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.osx/artifacts/public/home.tar.xz"
  scripts:
    build: "taskcluster/host-build.sh"
    package: "taskcluster/package.sh"
--- a/taskcluster/darwin-amd64-ctc-opt.yml
+++ b/taskcluster/darwin-amd64-ctc-opt.yml
@ -6,7 +6,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.osx-ctc.${event.head.sha}"
    - "notify.irc-channel.${notifications.irc}.on-exception"
    - "notify.irc-channel.${notifications.irc}.on-failed"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.osx/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.osx/artifacts/public/home.tar.xz"
  maxRunTime: 14400
  scripts:
    build: 'taskcluster/decoder-build.sh'
--- a/taskcluster/linux-amd64-cpu-opt.yml
+++ b/taskcluster/linux-amd64-cpu-opt.yml
@ -14,7 +14,7 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.cpu/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.cpu/artifacts/public/home.tar.xz"
  scripts:
    build: "taskcluster/host-build.sh"
    package: "taskcluster/package.sh"
--- a/taskcluster/linux-amd64-ctc-opt.yml
+++ b/taskcluster/linux-amd64-ctc-opt.yml
@ -14,7 +14,7 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.cpu/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.cpu/artifacts/public/home.tar.xz"
  scripts:
    build: 'taskcluster/decoder-build.sh'
    package: 'taskcluster/decoder-package.sh'
--- a/taskcluster/linux-amd64-gpu-opt.yml
+++ b/taskcluster/linux-amd64-gpu-opt.yml
@ -12,7 +12,7 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.gpu/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.gpu/artifacts/public/home.tar.xz"
  maxRunTime: 14400
  scripts:
    build: "taskcluster/cuda-build.sh"
--- a/taskcluster/linux-arm64-cpu-opt.yml
+++ b/taskcluster/linux-arm64-cpu-opt.yml
@ -4,7 +4,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm64"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm64"
    - "index.project.deepspeech.deepspeech.native_client.arm64.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.arm64/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.arm64/artifacts/public/home.tar.xz"
  ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
  system_setup:
    >
--- a/taskcluster/linux-rpi3-cpu-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-opt.yml
@ -4,7 +4,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm"
    - "index.project.deepspeech.deepspeech.native_client.arm.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.arm/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.arm/artifacts/public/home.tar.xz"
  ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
  system_setup:
    >
--- a/taskcluster/node-package.yml
+++ b/taskcluster/node-package.yml
@ -16,7 +16,7 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.cpu/artifacts/public/home.tar.xz"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.cpu/artifacts/public/home.tar.xz"
  scripts:
    build: "taskcluster/node-build.sh"
    package: "taskcluster/node-package.sh"
--- a/taskcluster/test-armbian-opt-base.tyml
+++ b/taskcluster/test-armbian-opt-base.tyml
@ -43,7 +43,7 @@ then:
        PIP_DEFAULT_TIMEOUT: "60"
        PIP_EXTRA_INDEX_URL: "https://lissyx.github.io/deepspeech-python-wheels/"
        EXTRA_PYTHON_CONFIGURE_OPTS: "--with-fpectl" # Required by Debian Stretch
-        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-rc2-11-gbea86c1"
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-10-ge232881"

    command:
      - "/bin/bash"
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@ -41,7 +41,7 @@ then:
        DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
        DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pb
        DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pbmm
-        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-rc2-11-gbea86c1"
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-10-ge232881"

    command:
      - - "/bin/bash"
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@ -45,7 +45,7 @@ then:
        DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pbmm
        DECODER_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${linux_amd64_ctc}/artifacts/public
        PIP_DEFAULT_TIMEOUT: "60"
-        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-rc2-11-gbea86c1"
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-10-ge232881"

    command:
      - "/bin/bash"
--- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
+++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
@ -4,7 +4,7 @@ build:
    - "test-training_upstream-linux-amd64-py27mu-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-lite_benchmark_model-ds-tests.sh"
-  benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.cpu/artifacts/public/lite_benchmark_model"
+  benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.cpu/artifacts/public/lite_benchmark_model"
  metadata:
    name: "DeepSpeech Linux AMD64 CPU TF Lite benchmark_model"
    description: "Testing DeepSpeech TF Lite benchmark_model for Linux/AMD64, CPU only, optimized version"
--- a/taskcluster/test-raspbian-opt-base.tyml
+++ b/taskcluster/test-raspbian-opt-base.tyml
@ -43,7 +43,7 @@ then:
        PIP_DEFAULT_TIMEOUT: "60"
        PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
        EXTRA_PYTHON_CONFIGURE_OPTS: "--with-fpectl" # Required by Raspbian Stretch / PiWheels
-        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-rc2-11-gbea86c1"
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.12.0-10-ge232881"

    command:
      - "/bin/bash"
--- a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
@ -7,7 +7,7 @@ build:
      apt-get -qq -y install ${python.packages_trusty.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu"
-  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.bea86c1e884730cf7f8615eb24d31872c198c766.cpu/artifacts/public/convert_graphdef_memmapped_format"
+  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.12.e232881c5a18204d946d4feba3c5aaa2d2c7dba0.cpu/artifacts/public/convert_graphdef_memmapped_format"
  metadata:
    name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu"
    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu, CPU only, optimized version"
--- a/tc-tests-utils.sh
+++ b/tc-tests-utils.sh
@ -413,6 +413,21 @@ do_deepspeech_binary_build()
    deepspeech
 }

+do_deepspeech_ndk_build()
+{
+  arch_abi=$1
+
+  cd ${DS_DSDIR}/native_client/
+
+  ${ANDROID_NDK_HOME}/ndk-build \
+    APP_PLATFORM=android-21 \
+    APP_BUILD_SCRIPT=$(pwd)/Android.mk \
+    NDK_PROJECT_PATH=$(pwd) \
+    APP_STL=c++_shared \
+    TFDIR=${DS_TFDIR} \
+    TARGET_ARCH_ABI=${arch_abi}
+}
+
 # Hack to extract Ubuntu's 16.04 libssl 1.0.2 packages and use them during the
 # local build of Python.
 #
@ -636,22 +651,42 @@ package_native_client()
    echo "Please specify artifact name."
  fi;

-  if [ -f "${tensorflow_dir}/bazel-bin/native_client/libdeepspeech_model.so" ]; then
-    tar -cf - \
-      -C ${tensorflow_dir}/bazel-bin/native_client/ generate_trie \
-      -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech.so \
-      -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech_model.so \
-      -C ${deepspeech_dir}/ LICENSE \
-      -C ${deepspeech_dir}/native_client/ deepspeech \
-      -C ${deepspeech_dir}/native_client/kenlm/ README.mozilla \
-      | pixz -9 > "${artifacts_dir}/${artifact_name}"
-  else
-    tar -cf - \
-      -C ${tensorflow_dir}/bazel-bin/native_client/ generate_trie \
-      -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech.so \
-      -C ${deepspeech_dir}/ LICENSE \
-      -C ${deepspeech_dir}/native_client/ deepspeech \
-      -C ${deepspeech_dir}/native_client/kenlm/ README.mozilla \
-      | pixz -9 > "${artifacts_dir}/${artifact_name}"
-  fi;
+  tar -cf - \
+    -C ${tensorflow_dir}/bazel-bin/native_client/ generate_trie \
+    -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech.so \
+    -C ${deepspeech_dir}/ LICENSE \
+    -C ${deepspeech_dir}/native_client/ deepspeech \
+    -C ${deepspeech_dir}/native_client/kenlm/ README.mozilla \
+    | pixz -9 > "${artifacts_dir}/${artifact_name}"
+}
+
+package_native_client_ndk()
+{
+  deepspeech_dir=${DS_DSDIR}
+  artifacts_dir=${TASKCLUSTER_ARTIFACTS}
+  artifact_name=$1
+  arch_abi=$2
+
+  if [ ! -d ${deepspeech_dir} -o ! -d ${artifacts_dir} ]; then
+    echo "Missing directory. Please check:"
+    echo "deepspeech_dir=${deepspeech_dir}"
+    echo "artifacts_dir=${artifacts_dir}"
+    exit 1
+  fi;
+
+  if [ -z "${artifact_name}" ]; then
+    echo "Please specify artifact name."
+  fi;
+
+  if [ -z "${arch_abi}" ]; then
+    echo "Please specify arch abi."
+  fi;
+
+  tar -cf - \
+    -C ${deepspeech_dir}/native_client/libs/${arch_abi}/ deepspeech \
+    -C ${deepspeech_dir}/native_client/libs/${arch_abi}/ libdeepspeech.so \
+    -C ${deepspeech_dir}/native_client/libs/${arch_abi}/ libc++_shared.so \
+    -C ${deepspeech_dir}/ LICENSE \
+    -C ${deepspeech_dir}/native_client/kenlm/ README.mozilla \
+    | pixz -9 > "${artifacts_dir}/${artifact_name}"
 }