|
5 | 5 | exit 1 |
6 | 6 | fi |
7 | 7 |
|
| 8 | + HOST_INFO=`uname -a` |
| 9 | + case ${HOST_INFO} in |
| 10 | + Darwin*) |
| 11 | + TOOLCHAIN_SYSTEM=darwin-x86_64 |
| 12 | + ;; |
| 13 | + Linux*) |
| 14 | + if [[ "${HOST_INFO}" == *i686* ]] |
| 15 | + then |
| 16 | + TOOLCHAIN_SYSTEM=linux-x86 |
| 17 | + else |
| 18 | + TOOLCHAIN_SYSTEM=linux-x86_64 |
| 19 | + fi |
| 20 | + ;; |
| 21 | + *) |
| 22 | + echo "Toolchain uknown for host system" |
| 23 | + exit 1 |
| 24 | + ;; |
| 25 | + esac |
| 26 | + |
8 | 27 | rm ../android-libs/armeabi/libcrypto.a \ |
9 | | - ../android-libs/x86/libcrypto.a |
10 | | - |
| 28 | + ../android-libs/x86/libcrypto.a |
| 29 | + |
11 | 30 | git clean -dfx && git checkout -f |
12 | 31 | ./Configure dist |
13 | 32 |
|
|
24 | 43 | ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \ |
25 | 44 | --platform=${ANDROID_PLATFORM_VERSION} \ |
26 | 45 | --install-dir=${ANDROID_TOOLCHAIN_DIR} \ |
27 | | - --system=darwin-x86_64 \ |
| 46 | + --system=${TOOLCHAIN_SYSTEM} \ |
28 | 47 | --arch=arm |
29 | 48 |
|
30 | 49 | export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH |
31 | 50 |
|
32 | 51 | RANLIB=arm-linux-androideabi-ranlib \ |
33 | | - AR=arm-linux-androideabi-ar \ |
34 | | - CC=arm-linux-androideabi-gcc \ |
| 52 | + AR=arm-linux-androideabi-ar \ |
| 53 | + CC=arm-linux-androideabi-gcc \ |
35 | 54 | ./Configure android ${OPENSSL_EXCLUSION_LIST} |
36 | 55 |
|
37 | 56 | make build_crypto |
|
43 | 62 | ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \ |
44 | 63 | --platform=${ANDROID_PLATFORM_VERSION} \ |
45 | 64 | --install-dir=${ANDROID_TOOLCHAIN_DIR} \ |
46 | | - --system=darwin-x86_64 \ |
| 65 | + --system=${TOOLCHAIN_SYSTEM} \ |
47 | 66 | --arch=x86 |
48 | 67 |
|
49 | 68 | export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH |
50 | 69 |
|
51 | 70 | RANLIB=i686-linux-android-ranlib \ |
52 | | - AR=i686-linux-android-ar \ |
53 | | - CC=i686-linux-android-gcc \ |
| 71 | + AR=i686-linux-android-ar \ |
| 72 | + CC=i686-linux-android-gcc \ |
54 | 73 | ./Configure android-x86 ${OPENSSL_EXCLUSION_LIST} |
55 | 74 |
|
56 | 75 | make build_crypto |
|
0 commit comments