diff options
| author |  Pete Warden <petewarden@google.com> | 2017-03-01 12:09:35 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-01 12:31:37 -0800 |
| commit | 03f1ff73c7caf58cd46cbc5d3713eea63dca2246 (patch) | |
| tree | 090aaae5bedc6e4b4044ded0514d3a369de63026 | |
| parent | 5902c73c9cee4388fcc5017f4b235eb2a13a2e99 (diff) | |
Internal-only changes
Change: 148915145
| -rw-r--r-- | tensorflow/core/BUILD | 8 | ||||
| -rw-r--r-- | tensorflow/core/platform/default/build_config.bzl | 6 | ||||
| -rw-r--r-- | tensorflow/core/platform/protobuf.h | 2 | ||||
| -rw-r--r-- | tensorflow/tools/proto_text/BUILD | 4 |
4 files changed, 15 insertions, 5 deletions
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index f681501ff4..2f8bacca85 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -107,6 +107,7 @@ load( "tf_kernel_tests_linkstatic", "tf_additional_cloud_op_deps", "tf_additional_cloud_kernel_deps", + "tf_lib_proto_parsing_deps", ) load( "//tensorflow/core:platform/default/build_config_root.bzl", @@ -221,10 +222,7 @@ cc_library( "platform/types.h", ] + glob(tf_additional_proto_hdrs()) + glob(tf_env_time_hdrs()), copts = tf_copts(), - deps = [ - ":protos_all_cc", - "//tensorflow/core/platform/default/build_config:proto_parsing", - ], + deps = tf_lib_proto_parsing_deps(), ) cc_library( @@ -446,7 +444,9 @@ cc_library( "framework/type_traits.h", "platform/default/dynamic_annotations.h", "platform/default/integral_types.h", + "platform/default/logging.h", "platform/default/mutex.h", + "platform/default/protobuf.h", "platform/default/thread_annotations.h", "platform/dynamic_annotations.h", "platform/macros.h", diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index 06418f83a1..a2c133b43a 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -241,3 +241,9 @@ def tf_additional_cloud_kernel_deps(): #if WITH_GCP_SUPPORT: # deps = if_not_mobile(["//tensorflow/core:cloud_ops_op_lib"]) return deps + +def tf_lib_proto_parsing_deps(): + return [ + ":protos_all_cc", + "//tensorflow/core/platform/default/build_config:proto_parsing", + ] diff --git a/tensorflow/core/platform/protobuf.h b/tensorflow/core/platform/protobuf.h index c7a72ee701..288d091624 100644 --- a/tensorflow/core/platform/protobuf.h +++ b/tensorflow/core/platform/protobuf.h @@ -25,7 +25,7 @@ limitations under the License. // TensorFlow code should use the ::tensorflow::protobuf namespace to // refer to all protobuf APIs. -#if defined(PLATFORM_GOOGLE) +#if defined(PLATFORM_GOOGLE) && !defined(USE_DEFAULT_PROTOBUF) #include "tensorflow/core/platform/google/protobuf.h" #else #include "tensorflow/core/platform/default/protobuf.h" diff --git a/tensorflow/tools/proto_text/BUILD b/tensorflow/tools/proto_text/BUILD index d439c9abfd..2d14538c8d 100644 --- a/tensorflow/tools/proto_text/BUILD +++ b/tensorflow/tools/proto_text/BUILD @@ -48,6 +48,10 @@ cc_library( "-lm", "-lpthread", ], + "//tensorflow:ios": [ + "-lm", + "-lpthread", + ], "//conditions:default": [ "-lm", "-lpthread", |