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/public_libraries.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libnativeloader/public_libraries.cpp') diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp index 258dbf69f0..4b56dc2a16 100644 --- a/libnativeloader/public_libraries.cpp +++ b/libnativeloader/public_libraries.cpp @@ -31,7 +31,7 @@ #include #include -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) #include #endif @@ -394,7 +394,7 @@ const std::string& apex_jni_libraries(const std::string& apex_ns_name) { } bool is_product_vndk_version_defined() { -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) return android::sysprop::VndkProperties::product_vndk_version().has_value(); #else return false; @@ -402,7 +402,7 @@ bool is_product_vndk_version_defined() { } std::string get_vndk_version(bool is_product_vndk) { -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) if (is_product_vndk) { return android::sysprop::VndkProperties::product_vndk_version().value_or(""); } -- cgit v1.2.3