experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update TFLite to use Android NDK r18b

Browse Source 
PiperOrigin-RevId: 334864650
Change-Id: I9a57085fee6513d8cb0867ee1f4da0ad54bbf328
This commit is contained in:
Jared Duke 2020-10-01 11:51:15 -07:00 committed by TensorFlower Gardener
parent 99908062d4
commit 63e7c149d7
4 changed files with 4 additions and 4 deletions
tensorflow
lite/g3doc/guide
build_android.md
tools
ci_build
Dockerfile.android
presubmit/ubuntu_16/android
build.sh
dockerfiles
tflite-android.Dockerfile

2
tensorflow/lite/g3doc/guide/build_android.md
View File

@ -99,7 +99,7 @@ prompt. Successful configuration should yield entries similar to the following
in the `.tf_configure.bazelrc` file in the root folder: in the `.tf_configure.bazelrc` file in the root folder:
```shell ```shell
build --action_env ANDROID_NDK_HOME="/usr/local/android/android-ndk-r17c" build --action_env ANDROID_NDK_HOME="/usr/local/android/android-ndk-r18b"
build --action_env ANDROID_NDK_API_LEVEL="21" build --action_env ANDROID_NDK_API_LEVEL="21"
build --action_env ANDROID_BUILD_TOOLS_VERSION="28.0.3" build --action_env ANDROID_BUILD_TOOLS_VERSION="28.0.3"
build --action_env ANDROID_SDK_API_LEVEL="23" build --action_env ANDROID_SDK_API_LEVEL="23"

2
tensorflow/tools/ci_build/Dockerfile.android
View File

@ -42,7 +42,7 @@ RUN cd ${ANDROID_DEV_HOME} && \
echo y | android update sdk --no-ui -a --filter tools,platform-tools,android-${ANDROID_API_LEVEL},build-tools-${ANDROID_BUILD_TOOLS_VERSION} echo y | android update sdk --no-ui -a --filter tools,platform-tools,android-${ANDROID_API_LEVEL},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
# Install Android NDK. # Install Android NDK.
ENV ANDROID_NDK_FILENAME android-ndk-r17c-linux-x86_64.zip ENV ANDROID_NDK_FILENAME android-ndk-r18b-linux-x86_64.zip
ENV ANDROID_NDK_URL https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME} ENV ANDROID_NDK_URL https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME}
ENV ANDROID_NDK_HOME ${ANDROID_DEV_HOME}/ndk ENV ANDROID_NDK_HOME ${ANDROID_DEV_HOME}/ndk
ENV PATH ${PATH}:${ANDROID_NDK_HOME} ENV PATH ${PATH}:${ANDROID_NDK_HOME}

2
tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh
View File

@ -25,7 +25,7 @@ set +u
set -x set -x
function run_build () { function run_build () {
export ANDROID_NDK_HOME="/opt/android-ndk-r17c" export ANDROID_NDK_HOME="/opt/android-ndk-r18b"
export NDK_HOME=$ANDROID_NDK_HOME export NDK_HOME=$ANDROID_NDK_HOME
export ANDROID_SDK_HOME="/opt/android-sdk/current" export ANDROID_SDK_HOME="/opt/android-sdk/current"
export ANDROID_API_LEVEL="23" export ANDROID_API_LEVEL="23"

2
tensorflow/tools/dockerfiles/tflite-android.Dockerfile
View File

@ -19,7 +19,7 @@ RUN cd ${ANDROID_DEV_HOME} && \
bash -c "ln -s ${ANDROID_DEV_HOME}/android-sdk-* ${ANDROID_SDK_HOME}" bash -c "ln -s ${ANDROID_DEV_HOME}/android-sdk-* ${ANDROID_SDK_HOME}"
# Install Android NDK. # Install Android NDK.
ENV ANDROID_NDK_FILENAME android-ndk-r17c-linux-x86_64.zip ENV ANDROID_NDK_FILENAME android-ndk-r18b-linux-x86_64.zip
ENV ANDROID_NDK_URL https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME} ENV ANDROID_NDK_URL https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME}
ENV ANDROID_NDK_HOME ${ANDROID_DEV_HOME}/ndk ENV ANDROID_NDK_HOME ${ANDROID_DEV_HOME}/ndk
ENV PATH ${PATH}:${ANDROID_NDK_HOME} ENV PATH ${PATH}:${ANDROID_NDK_HOME}