|
86 | 86 | #define OPENSSL_WINDOWS
|
87 | 87 | #endif
|
88 | 88 |
|
89 |
| -// Trusty and Android baremetal aren't Linux but currently define __linux__. |
| 89 | +// Android baremetal aren't Linux but currently define __linux__. |
90 | 90 | // As a workaround, we exclude them here.
|
91 | 91 | // We also exclude nanolibc/CrOS EC/Zephyr. nanolibc/CrOS EC/Zephyr
|
92 | 92 | // sometimes build for a non-Linux target (which should not define __linux__),
|
93 | 93 | // but also sometimes build for Linux. Although technically running in Linux
|
94 | 94 | // userspace, this lacks all the libc APIs we'd normally expect on Linux, so we
|
95 | 95 | // treat it as a non-Linux target.
|
96 | 96 | //
|
97 |
| -// TODO(b/169780122): Remove this workaround once Trusty no longer defines it. |
98 | 97 | // TODO(b/291101350): Remove this workaround once Android baremetal no longer
|
99 | 98 | // defines it.
|
100 |
| -#if defined(__linux__) && !defined(__TRUSTY__) && \ |
| 99 | +#if defined(__linux__) && \ |
101 | 100 | !defined(ANDROID_BAREMETAL) && !defined(OPENSSL_NANOLIBC) && \
|
102 | 101 | !defined(CROS_EC) && !defined(CROS_ZEPHYR)
|
103 | 102 | #define OPENSSL_LINUX
|
104 | 103 | #endif
|
105 | 104 |
|
106 |
| -#if defined(__Fuchsia__) |
107 |
| -#define OPENSSL_FUCHSIA |
108 |
| -#endif |
109 |
| - |
110 |
| -// Trusty is Android's TEE target. See |
111 |
| -// https://source.android.com/docs/security/features/trusty |
112 |
| -// |
113 |
| -// Defining this on any other platform is not supported. Other embedded |
114 |
| -// platforms must introduce their own defines. |
115 |
| -#if defined(__TRUSTY__) |
116 |
| -#define OPENSSL_TRUSTY |
117 |
| -#define OPENSSL_NO_FILESYSTEM |
118 |
| -#define OPENSSL_NO_POSIX_IO |
119 |
| -#define OPENSSL_NO_SOCK |
120 |
| -#define OPENSSL_NO_THREADS_CORRUPT_MEMORY_AND_LEAK_SECRETS_IF_THREADED |
121 |
| -#endif |
122 |
| - |
123 | 105 | // nanolibc is a particular minimal libc implementation. Defining this on any
|
124 | 106 | // other platform is not supported. Other embedded platforms must introduce
|
125 | 107 | // their own defines.
|
|
0 commit comments