From 1a0b21e16b08ab0bb1c15f9b5ec040bfbdee2685 Mon Sep 17 00:00:00 2001
From: YoungSeok Yoon <youngseokyoon@google.com>
Date: Wed, 7 Apr 2021 18:49:13 -0700
Subject: [PATCH] Update NDK version to r19c

PiperOrigin-RevId: 367340749
Change-Id: I770ad6efc9b7a4ec822ba7cafd36d73e31daaf8e
---
 configure.py                                                | 4 +++-
 tensorflow/lite/g3doc/guide/build_android.md                | 6 +++---
 .../tools/ci_build/presubmit/ubuntu_16/android/build.sh     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.py b/configure.py
index 5207db40cfd..5b11360088f 100644
--- a/configure.py
+++ b/configure.py
@@ -39,7 +39,9 @@ _DEFAULT_CUDNN_VERSION = '7'
 _DEFAULT_TENSORRT_VERSION = '6'
 _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
 
diff --git a/tensorflow/lite/g3doc/guide/build_android.md b/tensorflow/lite/g3doc/guide/build_android.md
index dd9468e0abb..e4accd0aafb 100644
--- a/tensorflow/lite/g3doc/guide/build_android.md
+++ b/tensorflow/lite/g3doc/guide/build_android.md
@@ -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).
 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
-    [here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-18b-downloads).
+    code. The current recommended version is 19c, which may be found
+    [here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-19c-downloads).
 3.  The Android SDK and build tools may be obtained
     [here](https://developer.android.com/tools/revisions/build-tools.html), or
     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:
 
 ```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_BUILD_TOOLS_VERSION="28.0.3"
 build --action_env ANDROID_SDK_API_LEVEL="23"
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 81afa226d3f..3ec40e1950d 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-r18b"
+  export ANDROID_NDK_HOME="/opt/android-ndk-r19c"
   export NDK_HOME=$ANDROID_NDK_HOME
   export ANDROID_SDK_HOME="/opt/android-sdk/current"
   export ANDROID_API_LEVEL="23"