From c2e9f671a7159d55746e0b0b54546aa65c2e325e Mon Sep 17 00:00:00 2001
From: Juhyun Lee <impjdi@google.com>
Date: Mon, 23 Dec 2019 16:04:06 -0800
Subject: [PATCH] Make //tf/compiler/xla:status_macros build with --config
 android_arm64.

PiperOrigin-RevId: 286955105
Change-Id: I8fcc9a8b726601ef2cf9a4e31eec2c5996d804f8
---
 tensorflow/core/platform/default/build_config.bzl |  4 ++--
 tensorflow/stream_executor/platform/BUILD         | 11 +++++------
 tensorflow/stream_executor/platform/default/BUILD |  5 ++---
 tensorflow/stream_executor/platform/logging.h     |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index dea6a9dc5fd..3042a20db46 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -753,8 +753,8 @@ def tf_windows_aware_platform_deps(name):
         ],
     })
 
-def tf_platform_deps(name):
-    return ["//tensorflow/core/platform/default:" + name]
+def tf_platform_deps(name, platform_dir = "//tensorflow/core/platform/"):
+    return [platform_dir + "default:" + name]
 
 def tf_platform_alias(name):
     return ["//tensorflow/core/platform/default:" + name]
diff --git a/tensorflow/stream_executor/platform/BUILD b/tensorflow/stream_executor/platform/BUILD
index e2ada9d387e..3d20cc2fdaa 100644
--- a/tensorflow/stream_executor/platform/BUILD
+++ b/tensorflow/stream_executor/platform/BUILD
@@ -1,3 +1,4 @@
+load("//tensorflow/core/platform:build_config.bzl", "tf_platform_deps")
 load("//tensorflow/stream_executor:build_defs.bzl", "stream_executor_friends")
 
 package(
@@ -13,17 +14,16 @@ package_group(
 cc_library(
     name = "platform",
     textual_hdrs = [
+        "initialize.h",
         "logging.h",
         "platform.h",
         "port.h",
         "thread_annotations.h",
-        "initialize.h",
     ],
     deps = [
-        "//tensorflow/core:lib",
-        "//tensorflow/stream_executor/platform/default:platform",
         "@com_google_absl//absl/strings",
-    ],
+        "//tensorflow/core:lib",
+    ] + tf_platform_deps("platform", "//tensorflow/stream_executor/platform/"),
 )
 
 cc_library(
@@ -31,6 +31,5 @@ cc_library(
     hdrs = ["dso_loader.h"],
     deps = [
         ":platform",
-        "//tensorflow/stream_executor/platform/default:dso_loader",
-    ],
+    ] + tf_platform_deps("dso_loader", "//tensorflow/stream_executor/platform/"),
 )
diff --git a/tensorflow/stream_executor/platform/default/BUILD b/tensorflow/stream_executor/platform/default/BUILD
index bd6404b92b5..032dc518f1a 100644
--- a/tensorflow/stream_executor/platform/default/BUILD
+++ b/tensorflow/stream_executor/platform/default/BUILD
@@ -6,9 +6,7 @@ load("//tensorflow:tensorflow.bzl", "tf_copts")
 
 cc_library(
     name = "platform",
-    textual_hdrs = [
-        "initialize.h",
-    ],
+    textual_hdrs = ["initialize.h"],
     deps = ["//tensorflow/core:lib"],
 )
 
@@ -21,6 +19,7 @@ cc_library(
     }),
     hdrs = ["dso_loader.h"],
     copts = tf_copts(),
+    tags = ["nobuilder"],
     deps = [
         "//tensorflow/stream_executor:platform",
         "//tensorflow/stream_executor/lib",
diff --git a/tensorflow/stream_executor/platform/logging.h b/tensorflow/stream_executor/platform/logging.h
index 6bc6ccb517d..348349b7eee 100644
--- a/tensorflow/stream_executor/platform/logging.h
+++ b/tensorflow/stream_executor/platform/logging.h
@@ -19,7 +19,7 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.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)