diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-04-24 15:43:48 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2020-04-27 09:34:03 +0000 |
| commit | 7ca8b67c21513d3cd236f47332afdd1be1cb1569 (patch) | |
| tree | 4e226c25734451053b85d24e5176abcc299e3986 /libnativeloader/native_loader_namespace.h | |
| parent | 5c25e537f59c2f87a57097ad3eb2f70d8c54de23 (diff) | |
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
Diffstat (limited to 'libnativeloader/native_loader_namespace.h')
| -rw-r--r-- | libnativeloader/native_loader_namespace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnativeloader/native_loader_namespace.h b/libnativeloader/native_loader_namespace.h index ee84f61cd8..a295d18f6a 100644 --- a/libnativeloader/native_loader_namespace.h +++ b/libnativeloader/native_loader_namespace.h @@ -17,7 +17,7 @@ #ifndef ART_LIBNATIVELOADER_NATIVE_LOADER_NAMESPACE_H_ #define ART_LIBNATIVELOADER_NATIVE_LOADER_NAMESPACE_H_ -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) #include <string> #include <variant> @@ -73,6 +73,6 @@ struct NativeLoaderNamespace { }; } // namespace android -#endif // #if defined(__ANDROID__) +#endif // #if defined(ART_TARGET_ANDROID) #endif // ART_LIBNATIVELOADER_NATIVE_LOADER_NAMESPACE_H_ |