diff --git a/native_client/Android.mk b/native_client/Android.mk index d21551fd..ee91a7a4 100644 --- a/native_client/Android.mk +++ b/native_client/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := deepspeech-prebuilt -LOCAL_SRC_FILES := $(TFDIR)/bazel-bin/native_client/libdeepspeech.so +LOCAL_SRC_FILES := $(TFDIR)/bazel-bin/native_client/libdeepspeech.so $(TFDIR)/bazel-bin/native_client/generate_scorer_package include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) diff --git a/taskcluster/android-build.sh b/taskcluster/android-build.sh index 0121e51d..83d8eecb 100644 --- a/taskcluster/android-build.sh +++ b/taskcluster/android-build.sh @@ -10,6 +10,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " if [ "${arm_flavor}" = "armeabi-v7a" ]; then diff --git a/taskcluster/arm64-build.sh b/taskcluster/arm64-build.sh index 7cfb7abf..1ca4028e 100644 --- a/taskcluster/arm64-build.sh +++ b/taskcluster/arm64-build.sh @@ -8,6 +8,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " BAZEL_BUILD_FLAGS="${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS}" diff --git a/taskcluster/cuda-build.sh b/taskcluster/cuda-build.sh index dfaa236a..f8213f81 100755 --- a/taskcluster/cuda-build.sh +++ b/taskcluster/cuda-build.sh @@ -8,6 +8,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " BAZEL_ENV_FLAGS="TF_NEED_CUDA=1 ${TF_CUDA_FLAGS}" diff --git a/taskcluster/host-build.sh b/taskcluster/host-build.sh index ddbc90fc..9ff3648c 100755 --- a/taskcluster/host-build.sh +++ b/taskcluster/host-build.sh @@ -10,6 +10,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " if [ "${runtime}" = "tflite" ]; then diff --git a/taskcluster/rpi3-build.sh b/taskcluster/rpi3-build.sh index e9b795a4..eabff730 100755 --- a/taskcluster/rpi3-build.sh +++ b/taskcluster/rpi3-build.sh @@ -8,6 +8,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " BAZEL_BUILD_FLAGS="${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS}" diff --git a/taskcluster/tc-package.sh b/taskcluster/tc-package.sh index 03997991..ec36bb84 100755 --- a/taskcluster/tc-package.sh +++ b/taskcluster/tc-package.sh @@ -24,6 +24,7 @@ package_native_client() ${TAR} -cf - \ -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech.so \ -C ${tensorflow_dir}/bazel-bin/native_client/ libdeepspeech.so.if.lib \ + -C ${tensorflow_dir}/bazel-bin/native_client/ generate_scorer_package \ -C ${deepspeech_dir}/ LICENSE \ -C ${deepspeech_dir}/native_client/ deepspeech${PLATFORM_EXE_SUFFIX} \ -C ${deepspeech_dir}/native_client/ deepspeech.h \ @@ -56,6 +57,7 @@ package_native_client_ndk() 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}/ generate_scorer_package \ -C ${deepspeech_dir}/native_client/libs/${arch_abi}/ libc++_shared.so \ -C ${deepspeech_dir}/native_client/ deepspeech.h \ -C ${deepspeech_dir}/ LICENSE \ diff --git a/taskcluster/win-build.sh b/taskcluster/win-build.sh index f5951db9..48c7a19f 100755 --- a/taskcluster/win-build.sh +++ b/taskcluster/win-build.sh @@ -10,6 +10,7 @@ source $(dirname "$0")/tf_tc-vars.sh BAZEL_TARGETS=" //native_client:libdeepspeech.so +//native_client:generate_scorer_package " if [ "${package_option}" = "--cuda" ]; then