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/library_namespaces.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libnativeloader/library_namespaces.h') diff --git a/libnativeloader/library_namespaces.h b/libnativeloader/library_namespaces.h index e6d1a87cbb..c41f2e461f 100644 --- a/libnativeloader/library_namespaces.h +++ b/libnativeloader/library_namespaces.h @@ -17,8 +17,8 @@ #ifndef ART_LIBNATIVELOADER_LIBRARY_NAMESPACES_H_ #define ART_LIBNATIVELOADER_LIBRARY_NAMESPACES_H_ -#if !defined(__ANDROID__) -#error "Not available for host" +#if !defined(ART_TARGET_ANDROID) +#error "Not available for host or linux target" #endif #define LOG_TAG "nativeloader" -- cgit v1.2.3