From 7ca8b67c21513d3cd236f47332afdd1be1cb1569 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 24 Apr 2020 15:43:48 +0100 Subject: Use ART_TARGET_ANDROID instead of __ANDROID__ On golem, we build for ART_TARGET_LINUX, which doesn't have support for linkerconfig. Therefore, guard all linker namespace code on ART_TARGET_ANDROID instead of __ANDROID__ (which is unfortunately not under ART's control). Test: build for golem and run Bug: 154074847 Change-Id: I7a2b81918177704b42d8aafbd6d7e9d06d34e5f4 --- libnativeloader/native_loader_namespace.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libnativeloader/native_loader_namespace.cpp') diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp index 49f3035dd5..79a9791dd0 100644 --- a/libnativeloader/native_loader_namespace.cpp +++ b/libnativeloader/native_loader_namespace.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#if defined(ART_TARGET_ANDROID) + #define LOG_TAG "nativeloader" #include "native_loader_namespace.h" @@ -175,3 +177,5 @@ Result NativeLoaderNamespace::Load(const char* lib_name) const { } } // namespace android + +#endif // defined(ART_TARGET_ANDROID) -- cgit v1.2.3