Skip to content

Commit e90b290

Browse files
committed
compile openssl statically because android use another SSL implementation from 6.0
1 parent 2ee5635 commit e90b290

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

Android.mk

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,8 +1475,7 @@ LOCAL_C_INCLUDES:= \
14751475
LOCAL_SRC_FILES:= \
14761476
ext/digest/md5/md5init.c\
14771477
ext/digest/md5/md5ossl.c
1478-
LOCAL_SHARED_LIBRARIES:= \
1479-
libcrypto
1478+
LOCAL_STATIC_LIBRARIES:= libcrypto_static
14801479
LOCAL_MODULE := RUBY_digest_md5
14811480

14821481
include $(BUILD_SHARED_LIBRARY)
@@ -1504,7 +1503,6 @@ LOCAL_SRC_FILES:= \
15041503
ext/digest/rmd160/rmd160init.c\
15051504
ext/digest/rmd160/rmd160ossl.c
15061505

1507-
# RMD160 missing on certain devices ( API >= 21 )
15081506
LOCAL_STATIC_LIBRARIES:= libcrypto_static
15091507

15101508
LOCAL_MODULE := RUBY_digest_rmd160
@@ -1533,8 +1531,7 @@ LOCAL_C_INCLUDES:= \
15331531
LOCAL_SRC_FILES:= \
15341532
ext/digest/sha1/sha1init.c\
15351533
ext/digest/sha1/sha1ossl.c
1536-
LOCAL_SHARED_LIBRARIES:= \
1537-
libcrypto
1534+
LOCAL_STATIC_LIBRARIES:= libcrypto_static
15381535
LOCAL_MODULE := RUBY_digest_sha1
15391536

15401537
include $(BUILD_SHARED_LIBRARY)
@@ -1561,8 +1558,7 @@ LOCAL_C_INCLUDES:= \
15611558
LOCAL_SRC_FILES:= \
15621559
ext/digest/sha2/sha2init.c\
15631560
ext/digest/sha2/sha2ossl.c
1564-
LOCAL_SHARED_LIBRARIES:= \
1565-
libcrypto
1561+
LOCAL_STATIC_LIBRARIES:= libcrypto_static
15661562
LOCAL_MODULE := RUBY_digest_sha2
15671563

15681564
include $(BUILD_SHARED_LIBRARY)
@@ -1981,9 +1977,9 @@ LOCAL_SRC_FILES:= \
19811977
ext/openssl/ossl_x509revoked.c\
19821978
ext/openssl/ossl_ns_spki.c\
19831979
ext/openssl/ossl_engine.c
1984-
LOCAL_SHARED_LIBRARIES:= \
1985-
libssl\
1986-
libcrypto
1980+
LOCAL_STATIC_LIBRARIES:= \
1981+
libcrypto_static\
1982+
libssl_static
19871983
LOCAL_MODULE := RUBY_openssl
19881984

19891985
include $(BUILD_SHARED_LIBRARY)

0 commit comments

Comments
 (0)