diff options
| author |  Andrew Harp <andrewharp@google.com> | 2017-09-14 09:22:51 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-09-14 09:27:18 -0700 |
| commit | 4f9efa79990ca3aadeb00a24772de986a5fce614 (patch) | |
| tree | d9fe57caa954f58e4676a47cab7029deaf6ba193 /tensorflow/contrib/android | |
| parent | 0550f50bfd1b02687d517928b5a7ce776e8892fc (diff) | |
Android: globally use -latomic to link TF Android targets to fix x86 targets (if_android_mips was not sufficient)
PiperOrigin-RevId: 168698051
Diffstat (limited to 'tensorflow/contrib/android')
| -rw-r--r-- | tensorflow/contrib/android/BUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/contrib/android/BUILD b/tensorflow/contrib/android/BUILD index 9c62d014ed..4bff3c27d2 100644 --- a/tensorflow/contrib/android/BUILD +++ b/tensorflow/contrib/android/BUILD @@ -11,7 +11,6 @@ load( "//tensorflow:tensorflow.bzl", "tf_copts", "if_android", - "if_android_mips", ) exports_files([ @@ -79,6 +78,7 @@ cc_binary( ], linkopts = if_android([ "-landroid", + "-latomic", "-ldl", "-llog", "-lm", @@ -87,7 +87,7 @@ cc_binary( "-Wl,--gc-sections", "-Wl,--version-script", # This line must be directly followed by LINKER_SCRIPT. LINKER_SCRIPT, - ]) + if_android_mips(["-latomic"]), + ]), linkshared = 1, linkstatic = 1, tags = [ |