Make //tf/compiler/xla:status_macros build with --config android_arm64.

PiperOrigin-RevId: 286955105
Change-Id: I8fcc9a8b726601ef2cf9a4e31eec2c5996d804f8
This commit is contained in:
Juhyun Lee 2019-12-23 16:04:06 -08:00 committed by TensorFlower Gardener
parent e724d9e162
commit c2e9f671a7
4 changed files with 10 additions and 12 deletions
tensorflow
core/platform/default
stream_executor/platform

View File

@ -753,8 +753,8 @@ def tf_windows_aware_platform_deps(name):
], ],
}) })
def tf_platform_deps(name): def tf_platform_deps(name, platform_dir = "//tensorflow/core/platform/"):
return ["//tensorflow/core/platform/default:" + name] return [platform_dir + "default:" + name]
def tf_platform_alias(name): def tf_platform_alias(name):
return ["//tensorflow/core/platform/default:" + name] return ["//tensorflow/core/platform/default:" + name]

View File

@ -1,3 +1,4 @@
load("//tensorflow/core/platform:build_config.bzl", "tf_platform_deps")
load("//tensorflow/stream_executor:build_defs.bzl", "stream_executor_friends") load("//tensorflow/stream_executor:build_defs.bzl", "stream_executor_friends")
package( package(
@ -13,17 +14,16 @@ package_group(
cc_library( cc_library(
name = "platform", name = "platform",
textual_hdrs = [ textual_hdrs = [
"initialize.h",
"logging.h", "logging.h",
"platform.h", "platform.h",
"port.h", "port.h",
"thread_annotations.h", "thread_annotations.h",
"initialize.h",
], ],
deps = [ deps = [
"//tensorflow/core:lib",
"//tensorflow/stream_executor/platform/default:platform",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
], "//tensorflow/core:lib",
] + tf_platform_deps("platform", "//tensorflow/stream_executor/platform/"),
) )
cc_library( cc_library(
@ -31,6 +31,5 @@ cc_library(
hdrs = ["dso_loader.h"], hdrs = ["dso_loader.h"],
deps = [ deps = [
":platform", ":platform",
"//tensorflow/stream_executor/platform/default:dso_loader", ] + tf_platform_deps("dso_loader", "//tensorflow/stream_executor/platform/"),
],
) )

View File

@ -6,9 +6,7 @@ load("//tensorflow:tensorflow.bzl", "tf_copts")
cc_library( cc_library(
name = "platform", name = "platform",
textual_hdrs = [ textual_hdrs = ["initialize.h"],
"initialize.h",
],
deps = ["//tensorflow/core:lib"], deps = ["//tensorflow/core:lib"],
) )
@ -21,6 +19,7 @@ cc_library(
}), }),
hdrs = ["dso_loader.h"], hdrs = ["dso_loader.h"],
copts = tf_copts(), copts = tf_copts(),
tags = ["nobuilder"],
deps = [ deps = [
"//tensorflow/stream_executor:platform", "//tensorflow/stream_executor:platform",
"//tensorflow/stream_executor/lib", "//tensorflow/stream_executor/lib",

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/logging.h"
#include "tensorflow/stream_executor/platform/port.h" #include "tensorflow/stream_executor/platform/port.h"
#if !defined(PLATFORM_GOOGLE) #if !defined(PLATFORM_GOOGLE) && !defined(PLATFORM_GOOGLE_ANDROID)
#define PCHECK(invocation) CHECK(invocation) #define PCHECK(invocation) CHECK(invocation)