diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-01-28 14:53:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-29 00:40:20 +0100 |
| commit | 6e826c471b7f0431391a4e9f9484f6ea2833774a (patch) | |
| tree | c90a93bc14bc4f0af786efc7a5f1d6156393f556 /NOTES.ANDROID | |
| parent | crypto/cms: Add support for CAdES Basic Electronic Signatures (CAdES-BES) (diff) | |
| download | openssl-6e826c471b7f0431391a4e9f9484f6ea2833774a.tar.xz openssl-6e826c471b7f0431391a4e9f9484f6ea2833774a.zip | |
Android build: use ANDROID_NDK_HOME rather than ANDROID_NDK
It apepars that ANDROID_NDK_HOME is the recommended standard
environment variable for the NDK.
We retain ANDROID_NDK as a fallback.
Fixes #8101
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8103)
Diffstat (limited to 'NOTES.ANDROID')
| -rw-r--r-- | NOTES.ANDROID | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/NOTES.ANDROID b/NOTES.ANDROID index 6b4741c336..eeacdaded6 100644 --- a/NOTES.ANDROID +++ b/NOTES.ANDROID @@ -23,7 +23,7 @@ platform. Though you still need to know the prefix to extend your PATH, in order to invoke $(CROSS_COMPILE)gcc and company. (Configure will fail and give you a hint if you get it wrong.) Apart from PATH adjustment - you need to set ANDROID_NDK environment to point at NDK directory + you need to set ANDROID_NDK_HOME environment to point at NDK directory as /some/where/android-ndk-<ver>. Both variables are significant at both configuration and compilation times. NDK customarily supports multiple Android API levels, e.g. android-14, android-21, etc. By default latest @@ -32,13 +32,13 @@ target platform version. For example, to compile for ICS on ARM with NDK 10d: - export ANDROID_NDK=/some/where/android-ndk-10d - PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin:$PATH + export ANDROID_NDK_HOME=/some/where/android-ndk-10d + PATH=$ANDROID_NDK_HOME/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin:$PATH ./Configure android-arm -D__ANDROID_API__=14 make Caveat lector! Earlier OpenSSL versions relied on additional CROSS_SYSROOT - variable set to $ANDROID_NDK/platforms/android-<api>/arch-<arch> to + variable set to $ANDROID_NDK_HOME/platforms/android-<api>/arch-<arch> to appoint headers-n-libraries' location. It's still recognized in order to facilitate migration from older projects. However, since API level appears in CROSS_SYSROOT value, passing -D__ANDROID_API__=N can be in @@ -53,9 +53,9 @@ Another option is to create so called "standalone toolchain" tailored for single specific platform including Android API level, and assign its - location to ANDROID_NDK. In such case you have to pass matching target - name to Configure and shouldn't use -D__ANDROID_API__=N. PATH adjustment - becomes simpler, $ANDROID_NDK/bin:$PATH suffices. + location to ANDROID_NDK_HOME. In such case you have to pass matching + target name to Configure and shouldn't use -D__ANDROID_API__=N. PATH + adjustment becomes simpler, $ANDROID_NDK_HOME/bin:$PATH suffices. Running tests (on Linux) ------------------------ |