aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/makefile/sub_makefiles
diff options
context:
space:
mode:
authorGravatar Andrew Harp <andrewharp@users.noreply.github.com>2018-01-31 23:43:18 -0500
committerGravatar Gunhan Gulsoy <gunan@google.com>2018-01-31 20:43:18 -0800
commit9e7ce91845500e5111e0400766983e69701a1733 (patch)
tree68f35b09a1741ea102a76d77721b31d1fb7ab3ac /tensorflow/contrib/makefile/sub_makefiles
parentdf62a679e960df935928c0a602851dfb1e867480 (diff)
Support multiple build types in Android build.gradle with the makefile build (#16640)
* updating CUDA srcs for Makefile build to fix unsatisfied link error * more makefile refactoring * Fixing Tegra build logic for Android * reverting ndk dir * set ccache back to default
Diffstat (limited to 'tensorflow/contrib/makefile/sub_makefiles')
-rw-r--r--tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in
index d9277ed60c..3081084ee7 100644
--- a/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in
+++ b/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in
@@ -54,7 +54,7 @@ $(INFERENCE_SO_PATH): $(LIB_OBJS) $(INFERENCE_OBJS) $(CUDA_LIB_DEPS)
-o $@ $(INFERENCE_OBJS) $(LIB_OBJS) $(TEGRA_LIBS) \
$(LIBFLAGS) $(LDFLAGS) \
-shared -Wl,-soname,$(INFERENCE_SO_NAME) \
- $(LIBS)
+ $(LIBS) $(CUDA_LIBS)
$(INFERENCE_SO_NAME): $(INFERENCE_SO_PATH)