OSSForks/tensorflow
1
0
Fork 0
mirror of https://github.com/zebrajr/tensorflow.git synced 2026-01-15 12:15:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update NDK version to r19c

Browse Source 
PiperOrigin-RevId: 367340749
Change-Id: I770ad6efc9b7a4ec822ba7cafd36d73e31daaf8e
This commit is contained in:
YoungSeok Yoon
2021-04-07 18:49:13 -07:00
committed by TensorFlower Gardener
parent 39c984fb21
commit 1a0b21e16b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.py
View File

@@ -39,7 +39,9 @@ _DEFAULT_CUDNN_VERSION = '7'
_DEFAULT_TENSORRT_VERSION = '6' _DEFAULT_TENSORRT_VERSION = '6'
_DEFAULT_CUDA_COMPUTE_CAPABILITIES = '3.5,7.0' _DEFAULT_CUDA_COMPUTE_CAPABILITIES = '3.5,7.0'
_SUPPORTED_ANDROID_NDK_VERSIONS = [10, 11, 12, 13, 14, 15, 16, 17, 18] _SUPPORTED_ANDROID_NDK_VERSIONS = [
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21
]
_DEFAULT_PROMPT_ASK_ATTEMPTS = 10 _DEFAULT_PROMPT_ASK_ATTEMPTS = 10

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

@@ -76,8 +76,8 @@ have it and the Android NDK and SDK installed on your system.
1. Install the latest version of the [Bazel build system](https://bazel.build/versions/master/docs/install.html). 1. Install the latest version of the [Bazel build system](https://bazel.build/versions/master/docs/install.html).
2. The Android NDK is required to build the native (C/C++) TensorFlow Lite 2. The Android NDK is required to build the native (C/C++) TensorFlow Lite
code. The current recommended version is 18b, which may be found code. The current recommended version is 19c, which may be found
[here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-18b-downloads). [here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-19c-downloads).
3. The Android SDK and build tools may be obtained 3. The Android SDK and build tools may be obtained
[here](https://developer.android.com/tools/revisions/build-tools.html), or [here](https://developer.android.com/tools/revisions/build-tools.html), or
alternatively as part of alternatively as part of
@@ -101,7 +101,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-r18b" build --action_env ANDROID_NDK_HOME="/usr/local/android/android-ndk-r19c"
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/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-r18b" export ANDROID_NDK_HOME="/opt/android-ndk-r19c"
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"