aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2018-09-10 10:43:05 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-09-10 10:46:56 -0700
commit3e137b24b06a81772402b86392dbd158653d487b (patch)
tree7c7abfd4cb5458877658e6a6399c88019602b151
parent07c0f308ecce579ec69ad53541332ccf506ca280 (diff)
Remove note in TF for Android build instructions about Bazel not supporting NDK 15/16.
PiperOrigin-RevId: 212292791
-rw-r--r--tensorflow/contrib/lite/java/demo/README.md6
-rw-r--r--tensorflow/examples/android/README.md8
2 files changed, 1 insertions, 13 deletions
diff --git a/tensorflow/contrib/lite/java/demo/README.md b/tensorflow/contrib/lite/java/demo/README.md
index e3cea19e16..6a3f0651d0 100644
--- a/tensorflow/contrib/lite/java/demo/README.md
+++ b/tensorflow/contrib/lite/java/demo/README.md
@@ -20,9 +20,6 @@ code to merge.
- Make sure to install the latest version of Bazel. Some distributions
ship with Bazel 0.5.4, which is too old.
- Bazel requires Android Build Tools `26.0.1` or higher.
- - **Bazel is incompatible with NDK revisions 15 and above,** with revision
- 16 being a compile-breaking change. [Download an older version manually
- instead of using the SDK Manager.](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/examples/android#install-bazel-and-android-prerequisites)
- You also need to install the Android Support Repository, available
through Android Studio under `Android SDK Manager -> SDK Tools ->
Android Support Repository`.
@@ -37,8 +34,7 @@ code to merge.
- Make sure the `api_level` in `WORKSPACE` is set to an SDK version that
you have installed.
- By default, Android Studio will install the SDK to `~/Android/Sdk` and
- the NDK to `~/Android/Sdk/ndk-bundle` (but the NDK should be a manual
- download until Bazel supports NDK 16. See bullet points under (1)).
+ the NDK to `~/Android/Sdk/ndk-bundle`.
2. Build the app with Bazel. The demo needs C++11:
diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md
index dac9b7ab82..82bc3ffda9 100644
--- a/tensorflow/examples/android/README.md
+++ b/tensorflow/examples/android/README.md
@@ -121,10 +121,6 @@ the Android NDK and SDK must be installed on your system.
2. The Android NDK is required to build the native (C/C++) TensorFlow code. The
current recommended version is 14b, which may be found
[here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-14b-downloads).
-
- * NDK 16, the revision released in November 2017, is **incompatible** with
- Bazel. See [here](https://github.com/tensorflow/tensorflow/issues/14918).
-
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 [Android
@@ -132,10 +128,6 @@ the Android NDK and SDK must be installed on your system.
23 is required to build the TF Android demo (though it will run on API >= 21
devices).
- - The Android Studio SDK Manager's NDK installer will install the latest
- revision of the NDK, which is **incompatible** with Bazel. You'll need
- to download an older version manually, as (2) suggests.
-
##### Edit WORKSPACE
NOTE: As long as you have the SDK and NDK installed, the `./configure` script