From 03ca94887c62cff6de755cd86d5b6c76c83fe1a0 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Fri, 26 Jun 2020 10:23:46 +0200
Subject: [PATCH] Move DS_ErrorCodeToErrorMessage impl to its own object so it
 can be used without including all of libdeepspeech

---
 native_client/BUILD                |  7 ++++---
 native_client/deepspeech.cc        | 17 -----------------
 native_client/deepspeech_errors.cc | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 native_client/deepspeech_errors.cc

diff --git a/native_client/BUILD b/native_client/BUILD
index 53711dc2..965a766c 100644
--- a/native_client/BUILD
+++ b/native_client/BUILD
@@ -89,13 +89,14 @@ cc_library(
 tf_cc_shared_object(
     name = "libdeepspeech.so",
     srcs = [
+        "alphabet.h",
         "deepspeech.cc",
         "deepspeech.h",
-        "alphabet.h",
-        "modelstate.h",
+        "deepspeech_errors.cc",
         "modelstate.cc",
-        "workspace_status.h",
+        "modelstate.h",
         "workspace_status.cc",
+        "workspace_status.h",
     ] + select({
         "//native_client:tflite": [
             "tflitemodelstate.h",
diff --git a/native_client/deepspeech.cc b/native_client/deepspeech.cc
index 3bcecc60..38868d4b 100644
--- a/native_client/deepspeech.cc
+++ b/native_client/deepspeech.cc
@@ -501,20 +501,3 @@ DS_Version()
 {
   return strdup(ds_version());
 }
-
-char*
-DS_ErrorCodeToErrorMessage(int aErrorCode)
-{
-#define RETURN_MESSAGE(NAME, VALUE, DESC) \
-    case NAME: \
-      return strdup(DESC);
-
-  switch(aErrorCode)
-  {
-    DS_FOR_EACH_ERROR(RETURN_MESSAGE)
-    default:
-      return strdup("Unknown error, please make sure you are using the correct native binary.");
-  }
-
-#undef RETURN_MESSAGE
-}
diff --git a/native_client/deepspeech_errors.cc b/native_client/deepspeech_errors.cc
new file mode 100644
index 00000000..1f1e4d8d
--- /dev/null
+++ b/native_client/deepspeech_errors.cc
@@ -0,0 +1,19 @@
+#include "deepspeech.h"
+#include <string.h>
+
+char*
+DS_ErrorCodeToErrorMessage(int aErrorCode)
+{
+#define RETURN_MESSAGE(NAME, VALUE, DESC) \
+    case NAME: \
+      return strdup(DESC);
+
+  switch(aErrorCode)
+  {
+    DS_FOR_EACH_ERROR(RETURN_MESSAGE)
+    default:
+      return strdup("Unknown error, please make sure you are using the correct native binary.");
+  }
+
+#undef RETURN_MESSAGE
+}