From 4f9889749c4b9e55ae2fc2a231d728a2dbcad0d2 Mon Sep 17 00:00:00 2001 From: Andrew Harp Date: Wed, 22 Feb 2017 11:06:31 -0800 Subject: Android: lower default NDK level to 14 from 21. This should allow prebuilt binaries to run on Android devices >= API 14. Change: 148242509 --- WORKSPACE | 2 +- tensorflow/examples/android/README.md | 6 ++++-- tensorflow/tools/ci_build/builds/builds_common.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 43354da196..c8aca38839 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -33,7 +33,7 @@ check_version("0.4.2") #android_ndk_repository( # name="androidndk", # path="", -# api_level=21) +# api_level=14) # Please add all new TensorFlow dependencies in workspace.bzl. tf_workspace() diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md index d2e4845052..6fdbd06ecd 100644 --- a/tensorflow/examples/android/README.md +++ b/tensorflow/examples/android/README.md @@ -12,7 +12,9 @@ Inference is done using the [TensorFlow Android Inference Interface](../../../te which may be built separately if you want a standalone library to drop into your existing application. -A device running Android 5.0 (API 21) or higher is required to run the demo. +A device running Android 5.0 (API 21) or higher is required to run the demo due +to the use of the camera2 API, although the native libraries themselves can run +on API >= 14 devices. ## Current samples: @@ -95,7 +97,7 @@ be reported. Also edit the API levels for the SDK in WORKSPACE to the highest level you have installed in your SDK. This must be >= 23 (this is completely independent of the API level of the demo, which is defined in AndroidManifest.xml). -The NDK API level may remain at 21. +The NDK API level may remain at 14. ##### Install Model Files (optional) diff --git a/tensorflow/tools/ci_build/builds/builds_common.sh b/tensorflow/tools/ci_build/builds/builds_common.sh index d9a6ce96a5..fd9a14bd69 100644 --- a/tensorflow/tools/ci_build/builds/builds_common.sh +++ b/tensorflow/tools/ci_build/builds/builds_common.sh @@ -230,7 +230,7 @@ android_sdk_repository( android_ndk_repository( name="androidndk", path="${ANDROID_NDK_HOME}", - api_level=21) + api_level=14) EOF fi fi -- cgit v1.2.3