aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/android
diff options
context:
space:
mode:
authorGravatar Andrew Harp <andrewharp@google.com>2017-09-07 14:55:29 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-09-07 15:00:04 -0700
commitd410a83207bdf63ead87a145f97377b7eb1f96bf (patch)
treed1fb0659696b9d830266993eb1ae547f9fb97a31 /tensorflow/contrib/android
parentf507437914ad802b1b6d09afc228bb23eeaf16eb (diff)
Android: make it possible to build TF with NDK 13+. The default compiler was switched from gcc to clang in 13b, which introduced a number of small incompatibilities.
PiperOrigin-RevId: 167915928
Diffstat (limited to 'tensorflow/contrib/android')
-rw-r--r--tensorflow/contrib/android/BUILD1
-rw-r--r--tensorflow/contrib/android/cmake/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/tensorflow/contrib/android/BUILD b/tensorflow/contrib/android/BUILD
index 0833790e99..9c62d014ed 100644
--- a/tensorflow/contrib/android/BUILD
+++ b/tensorflow/contrib/android/BUILD
@@ -79,6 +79,7 @@ cc_binary(
],
linkopts = if_android([
"-landroid",
+ "-ldl",
"-llog",
"-lm",
"-z defs",
diff --git a/tensorflow/contrib/android/cmake/CMakeLists.txt b/tensorflow/contrib/android/cmake/CMakeLists.txt
index 11e2128d72..25ada5ba27 100644
--- a/tensorflow/contrib/android/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/android/cmake/CMakeLists.txt
@@ -62,6 +62,7 @@ add_library(tensorflow_inference SHARED
# Include libraries needed for hello-jni lib
target_link_libraries(tensorflow_inference
android
+ dl
log
m
z