Skip to content

Commit 13f05c7

Browse files
author
minggo
committed
revert the modification of websockets
1 parent d9d809c commit 13f05c7

48 files changed

Lines changed: 10566 additions & 3307 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎curl/prebuilt/android/Android.mk‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,3 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
88
LOCAL_STATIC_LIBRARIES += cocos_ssl_static
99
LOCAL_STATIC_LIBRARIES += cocos_crypto_static
1010
include $(PREBUILT_STATIC_LIBRARY)
11-
12-
include $(CLEAR_VARS)
13-
14-
LOCAL_MODULE := cocos_crypto_static
15-
LOCAL_MODULE_FILENAME := crypto
16-
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
17-
include $(PREBUILT_STATIC_LIBRARY)
18-
19-
LOCAL_MODULE := cocos_ssl_static
20-
LOCAL_MODULE_FILENAME := ssl
21-
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
22-
include $(PREBUILT_STATIC_LIBRARY)

‎openssl/prebuilt/android/Android.mk‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := cocos_crypto_static
6+
LOCAL_MODULE_FILENAME := crypto
7+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
8+
include $(PREBUILT_STATIC_LIBRARY)
9+
10+
LOCAL_MODULE := cocos_ssl_static
11+
LOCAL_MODULE_FILENAME := ssl
12+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
13+
include $(PREBUILT_STATIC_LIBRARY)

curl/prebuilt/android/arm64-v8a/libcrypto.a renamed to openssl/prebuilt/android/arm64-v8a/libcrypto.a

File renamed without changes.

curl/prebuilt/android/arm64-v8a/libssl.a renamed to openssl/prebuilt/android/arm64-v8a/libssl.a

File renamed without changes.

curl/prebuilt/android/armeabi-v7a/libcrypto.a renamed to openssl/prebuilt/android/armeabi-v7a/libcrypto.a

File renamed without changes.

curl/prebuilt/android/armeabi-v7a/libssl.a renamed to openssl/prebuilt/android/armeabi-v7a/libssl.a

File renamed without changes.

curl/prebuilt/android/armeabi/libcrypto.a renamed to openssl/prebuilt/android/armeabi/libcrypto.a

File renamed without changes.

curl/prebuilt/android/armeabi/libssl.a renamed to openssl/prebuilt/android/armeabi/libssl.a

File renamed without changes.

curl/prebuilt/android/x86/libcrypto.a renamed to openssl/prebuilt/android/x86/libcrypto.a

File renamed without changes.

curl/prebuilt/android/x86/libssl.a renamed to openssl/prebuilt/android/x86/libssl.a

File renamed without changes.

0 commit comments

Comments
 (0)