diff options
| author |  Shashi Shekhar <shashishekhar@google.com> | 2018-07-31 17:25:35 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-31 17:34:30 -0700 |
| commit | 76948a4a7548056a83bf1dbedd286cfa0c08d66f (patch) | |
| tree | 9d04d0a6588aa533b343793b838bf39afc715723 | |
| parent | 696e8fc3f53d26cbd20f710721276c23df8b7641 (diff) | |
Fix Android compilation for
third_party/tensorflow/core/kernels:android_tensorflow_image_op
PiperOrigin-RevId: 206856355
| -rw-r--r-- | tensorflow/core/kernels/BUILD | 4 | ||||
| -rw-r--r-- | tensorflow/core/platform/gif.h | 4 | ||||
| -rw-r--r-- | tensorflow/core/platform/jpeg.h | 4 | ||||
| -rw-r--r-- | tensorflow/core/platform/logging.h | 3 | ||||
| -rw-r--r-- | tensorflow/core/platform/png.h | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 40cd955b7e..6126e8b7ba 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -5367,10 +5367,6 @@ cc_library( srcs = if_android(["decode_image_op.cc"]), copts = tf_copts(), linkopts = ["-ldl"], - tags = [ - "manual", - "notap", - ], visibility = ["//visibility:public"], deps = [ "//tensorflow/core:android_gif_internal", diff --git a/tensorflow/core/platform/gif.h b/tensorflow/core/platform/gif.h index ab095a35c9..61b9fbbcb2 100644 --- a/tensorflow/core/platform/gif.h +++ b/tensorflow/core/platform/gif.h @@ -18,10 +18,10 @@ limitations under the License. #include "tensorflow/core/platform/platform.h" -#if defined(PLATFORM_GOOGLE) +#if defined(PLATFORM_GOOGLE) && !defined(IS_MOBILE_PLATFORM) #include "tensorflow/core/platform/google/build_config/gif.h" #elif defined(PLATFORM_POSIX) || defined(PLATFORM_WINDOWS) || \ - defined(PLATFORM_POSIX_ANDROID) + defined(PLATFORM_POSIX_ANDROID) || defined(IS_MOBILE_PLATFORM) #include <gif_lib.h> #else #error Define the appropriate PLATFORM_<foo> macro for this platform diff --git a/tensorflow/core/platform/jpeg.h b/tensorflow/core/platform/jpeg.h index 1b5e633f0a..f98ddb8c98 100644 --- a/tensorflow/core/platform/jpeg.h +++ b/tensorflow/core/platform/jpeg.h @@ -18,10 +18,10 @@ limitations under the License. #include "tensorflow/core/platform/platform.h" -#if defined(PLATFORM_GOOGLE) +#if defined(PLATFORM_GOOGLE) && !defined(IS_MOBILE_PLATFORM) #include "tensorflow/core/platform/google/build_config/jpeg.h" #elif defined(PLATFORM_POSIX) || defined(PLATFORM_WINDOWS) || \ - defined(PLATFORM_POSIX_ANDROID) + defined(PLATFORM_POSIX_ANDROID) || defined(IS_MOBILE_PLATFORM) #include <stddef.h> #include <stdio.h> #include <stdlib.h> diff --git a/tensorflow/core/platform/logging.h b/tensorflow/core/platform/logging.h index 985c061676..44d4d91a00 100644 --- a/tensorflow/core/platform/logging.h +++ b/tensorflow/core/platform/logging.h @@ -18,8 +18,7 @@ limitations under the License. #include "tensorflow/core/platform/platform.h" // To pick up PLATFORM_define -#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_GOOGLE_ANDROID) || \ - defined(GOOGLE_LOGGING) +#if defined(PLATFORM_GOOGLE) || defined(GOOGLE_LOGGING) #include "tensorflow/core/platform/google/build_config/logging.h" #else #include "tensorflow/core/platform/default/logging.h" diff --git a/tensorflow/core/platform/png.h b/tensorflow/core/platform/png.h index dad18d7219..b110d63aba 100644 --- a/tensorflow/core/platform/png.h +++ b/tensorflow/core/platform/png.h @@ -18,10 +18,10 @@ limitations under the License. #include "tensorflow/core/platform/platform.h" -#if defined(PLATFORM_GOOGLE) +#if defined(PLATFORM_GOOGLE) && !defined(IS_MOBILE_PLATFORM) #include "tensorflow/core/platform/google/build_config/png.h" #elif defined(PLATFORM_POSIX) || defined(PLATFORM_WINDOWS) || \ - defined(PLATFORM_POSIX_ANDROID) + defined(PLATFORM_POSIX_ANDROID) || defined(IS_MOBILE_PLATFORM) #include <png.h> #else #error Define the appropriate PLATFORM_<foo> macro for this platform |