From 63e7c149d7817edb63adc085c9650e1659f3b699 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Thu, 1 Oct 2020 11:51:15 -0700 Subject: [PATCH] Update TFLite to use Android NDK r18b PiperOrigin-RevId: 334864650 Change-Id: I9a57085fee6513d8cb0867ee1f4da0ad54bbf328 --- tensorflow/lite/g3doc/guide/build_android.md | 2 +- tensorflow/tools/ci_build/Dockerfile.android | 2 +- tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh | 2 +- tensorflow/tools/dockerfiles/tflite-android.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorflow/lite/g3doc/guide/build_android.md b/tensorflow/lite/g3doc/guide/build_android.md index 792c609bc0e..32fc6f1facc 100644 --- a/tensorflow/lite/g3doc/guide/build_android.md +++ b/tensorflow/lite/g3doc/guide/build_android.md @@ -99,7 +99,7 @@ prompt. Successful configuration should yield entries similar to the following in the `.tf_configure.bazelrc` file in the root folder: ```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_BUILD_TOOLS_VERSION="28.0.3" build --action_env ANDROID_SDK_API_LEVEL="23" diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android index 80949ac64eb..03edba478af 100644 --- a/tensorflow/tools/ci_build/Dockerfile.android +++ b/tensorflow/tools/ci_build/Dockerfile.android @@ -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} # 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_HOME ${ANDROID_DEV_HOME}/ndk ENV PATH ${PATH}:${ANDROID_NDK_HOME} diff --git a/tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh b/tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh index c20a0b14677..81afa226d3f 100644 --- a/tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh +++ b/tensorflow/tools/ci_build/presubmit/ubuntu_16/android/build.sh @@ -25,7 +25,7 @@ set +u set -x 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 ANDROID_SDK_HOME="/opt/android-sdk/current" export ANDROID_API_LEVEL="23" diff --git a/tensorflow/tools/dockerfiles/tflite-android.Dockerfile b/tensorflow/tools/dockerfiles/tflite-android.Dockerfile index 71286c69642..4501054b77a 100644 --- a/tensorflow/tools/dockerfiles/tflite-android.Dockerfile +++ b/tensorflow/tools/dockerfiles/tflite-android.Dockerfile @@ -19,7 +19,7 @@ RUN cd ${ANDROID_DEV_HOME} && \ bash -c "ln -s ${ANDROID_DEV_HOME}/android-sdk-* ${ANDROID_SDK_HOME}" # 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_HOME ${ANDROID_DEV_HOME}/ndk ENV PATH ${PATH}:${ANDROID_NDK_HOME}