File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ if(CMAKE_CROSSCOMPILING)
157157 set (openssl_extra_opts no -asm)
158158 set (openssl_extra_env SYSTEM=Linux )
159159 set (deps_CFLAGS "${deps_CFLAGS} --sysroot=${ANDROID_TOOLCHAIN_ROOT} /sysroot" )
160- if (CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
160+ if (CMAKE_ANDROID_ARCH_ABI MATCHES x86_64 OR CMAKE_ANDROID_ARCH_ABI MATCHES x86 )
161161 # NOTE: Sysroot isn't sufficient to find the asm/ folder sitting in the host-tagged folder
162162 # /usr/lib/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/linux/types.h:9:10: fatal error: 'asm/types.h' file not found
163163 # At
@@ -176,7 +176,8 @@ build_external(openssl
176176 no -shared no -capieng no -dso no -dtls1 no -ec_nistp_64_gcc_128 no -gost
177177 no -heartbeats no -md2 no -rc5 no -rdrand no -rfc3779 no -sctp no -ssl-trace no -ssl2 no -ssl3
178178 no -static-engine no -tests no -weak-ssl-ciphers no -zlib no -zlib-dynamic
179- INSTALL_COMMAND make install_sw
179+ BUILD_COMMAND make libcrypto.a libssl.a
180+ INSTALL_COMMAND make install_dev
180181 BUILD_BYPRODUCTS
181182 ${DEPS_DESTDIR} /lib/libssl.a ${DEPS_DESTDIR} /lib/libcrypto.a
182183 ${DEPS_DESTDIR} /include/openssl/ssl.h ${DEPS_DESTDIR} /include/openssl/crypto.h
You can’t perform that action at this time.
0 commit comments