Skip to content

Commit 4397966

Browse files
committed
use LOCAL_SHARED_LIBRARIES instead of LOCAL_LDLIBS to suppress warnings
1 parent ddbb72d commit 4397966

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

Android.mk

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,8 +1477,8 @@ LOCAL_C_INCLUDES:= \
14771477
LOCAL_SRC_FILES:= \
14781478
ext/digest/md5/md5init.c\
14791479
ext/digest/md5/md5ossl.c
1480-
LOCAL_LDLIBS:= \
1481-
-lcrypto
1480+
LOCAL_SHARED_LIBRARIES:= \
1481+
libcrypto
14821482
LOCAL_MODULE := RUBY_digest_md5
14831483

14841484
include $(BUILD_SHARED_LIBRARY)
@@ -1505,8 +1505,8 @@ LOCAL_C_INCLUDES:= \
15051505
LOCAL_SRC_FILES:= \
15061506
ext/digest/rmd160/rmd160init.c\
15071507
ext/digest/rmd160/rmd160ossl.c
1508-
LOCAL_LDLIBS:= \
1509-
-lcrypto
1508+
LOCAL_SHARED_LIBRARIES:= \
1509+
libcrypto
15101510
LOCAL_MODULE := RUBY_digest_rmd160
15111511

15121512
include $(BUILD_SHARED_LIBRARY)
@@ -1533,8 +1533,8 @@ LOCAL_C_INCLUDES:= \
15331533
LOCAL_SRC_FILES:= \
15341534
ext/digest/sha1/sha1init.c\
15351535
ext/digest/sha1/sha1ossl.c
1536-
LOCAL_LDLIBS:= \
1537-
-lcrypto
1536+
LOCAL_SHARED_LIBRARIES:= \
1537+
libcrypto
15381538
LOCAL_MODULE := RUBY_digest_sha1
15391539

15401540
include $(BUILD_SHARED_LIBRARY)
@@ -1561,8 +1561,8 @@ LOCAL_C_INCLUDES:= \
15611561
LOCAL_SRC_FILES:= \
15621562
ext/digest/sha2/sha2init.c\
15631563
ext/digest/sha2/sha2ossl.c
1564-
LOCAL_LDLIBS:= \
1565-
-lcrypto
1564+
LOCAL_SHARED_LIBRARIES:= \
1565+
libcrypto
15661566
LOCAL_MODULE := RUBY_digest_sha2
15671567

15681568
include $(BUILD_SHARED_LIBRARY)
@@ -1981,9 +1981,9 @@ LOCAL_SRC_FILES:= \
19811981
ext/openssl/ossl_x509revoked.c\
19821982
ext/openssl/ossl_ns_spki.c\
19831983
ext/openssl/ossl_engine.c
1984-
LOCAL_LDLIBS:= \
1985-
-lssl\
1986-
-lcrypto
1984+
LOCAL_SHARED_LIBRARIES:= \
1985+
libssl\
1986+
libcrypto
19871987
LOCAL_MODULE := RUBY_openssl
19881988

19891989
include $(BUILD_SHARED_LIBRARY)
@@ -2319,7 +2319,8 @@ LOCAL_C_INCLUDES:= \
23192319
$(LOCAL_PATH)/include
23202320
LOCAL_SRC_FILES:= \
23212321
ext/zlib/zlib.c
2322-
LOCAL_LDLIBS += -lz
2322+
LOCAL_SHARED_LIBRARIES:= \
2323+
libz
23232324
LOCAL_MODULE := RUBY_zlib
23242325

23252326
include $(BUILD_SHARED_LIBRARY)
@@ -2345,8 +2346,8 @@ LOCAL_SRC_FILES:= \
23452346
main.c
23462347
LOCAL_STATIC_LIBRARIES:= \
23472348
libruby-static
2348-
LOCAL_LDLIBS:= \
2349-
-ldl
2349+
LOCAL_SHARED_LIBRARIES:= \
2350+
libdl
23502351
LOCAL_MODULE := ruby
23512352

23522353

0 commit comments

Comments
 (0)