diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-12-28 15:40:08 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-12-28 15:40:08 +0100 |
| commit | 882c350010a62e53e85ff7b3bba50d1b36e8ed05 (patch) | |
| tree | 085065b4ed0b60a56f38a11b63412aaff3cb92b2 | |
| parent | 32f2d8b878ed658d927d623783b6c14ee78525c0 (diff) | |
libshims: remove mtk_agpsd shim
| -rw-r--r-- | mtk/libshims/Android.mk | 15 | ||||
| -rw-r--r-- | mtk/libshims/agps/crypto.c | 13 | ||||
| -rw-r--r-- | mtk/libshims/agps/icu53.c | 72 | ||||
| -rw-r--r-- | mtk/libshims/agps/ssl.c | 24 |
4 files changed, 0 insertions, 124 deletions
diff --git a/mtk/libshims/Android.mk b/mtk/libshims/Android.mk index d4dd8f7..0235615 100644 --- a/mtk/libshims/Android.mk +++ b/mtk/libshims/Android.mk @@ -1,20 +1,5 @@ LOCAL_PATH := $(call my-dir) -## libshim_agps -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - agps/crypto.c \ - agps/icu53.c \ - agps/ssl.c - -LOCAL_SHARED_LIBRARIES := liblog libicuuc libssl libcrypto -LOCAL_MODULE := libshim_agps -LOCAL_CFLAGS := -O3 -Wno-unused-variable -Wno-unused-parameter -LOCAL_PROPRIETARY_MODULE := true -include $(BUILD_SHARED_LIBRARY) - - ## libshim_ui include $(CLEAR_VARS) diff --git a/mtk/libshims/agps/crypto.c b/mtk/libshims/agps/crypto.c deleted file mode 100644 index c3a4e43..0000000 --- a/mtk/libshims/agps/crypto.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <malloc.h> - -void CRYPTO_free(void *str) { - free(str); -} - -void *CRYPTO_malloc(int num, const char *file, int line) { - return malloc(num); -} - -void CRYPTO_lock(int mode, int type, const char *file, int line) { - CRYPTO_lock(mode, type, file, line); -} diff --git a/mtk/libshims/agps/icu53.c b/mtk/libshims/agps/icu53.c deleted file mode 100644 index a7752fd..0000000 --- a/mtk/libshims/agps/icu53.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "unicode/ucnv.h" - -U_STABLE UConverter* U_EXPORT2 -ucnv_open_53(const char *converterName, UErrorCode *err) -{ - return ucnv_open(converterName, err); -} - -U_STABLE void U_EXPORT2 -ucnv_close_53(UConverter * converter) -{ - return ucnv_close(converter); -} - -U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP_53( - const void *context, - UConverterToUnicodeArgs *toUArgs, - const char* codeUnits, - int32_t length, - UConverterCallbackReason reason, - UErrorCode * err) -{ - UCNV_TO_U_CALLBACK_STOP(context, toUArgs, codeUnits, length, reason, err); -} - -U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP_53( - const void *context, - UConverterFromUnicodeArgs *fromUArgs, - const UChar* codeUnits, - int32_t length, - UChar32 codePoint, - UConverterCallbackReason reason, - UErrorCode * err) -{ - UCNV_FROM_U_CALLBACK_STOP (context, fromUArgs, codeUnits, length, codePoint, reason, err); -} - -U_STABLE void U_EXPORT2 -ucnv_setToUCallBack_53(UConverter * converter, - UConverterToUCallback newAction, - const void* newContext, - UConverterToUCallback *oldAction, - const void** oldContext, - UErrorCode * err) -{ - ucnv_setToUCallBack(converter, newAction, newContext, oldAction, oldContext, err); -} - -U_STABLE void U_EXPORT2 -ucnv_setFromUCallBack_53(UConverter * converter, - UConverterFromUCallback newAction, - const void *newContext, - UConverterFromUCallback *oldAction, - const void **oldContext, - UErrorCode * err) -{ - ucnv_setFromUCallBack(converter, newAction, newContext, oldAction, oldContext, err); -} - -U_STABLE void U_EXPORT2 -ucnv_convertEx_53(UConverter *targetCnv, UConverter *sourceCnv, - char **target, const char *targetLimit, - const char **source, const char *sourceLimit, - UChar *pivotStart, UChar **pivotSource, - UChar **pivotTarget, const UChar *pivotLimit, - UBool reset, UBool flush, - UErrorCode *pErrorCode) -{ - ucnv_convertEx(targetCnv, sourceCnv, target, targetLimit, source, sourceLimit, - pivotStart, pivotSource, pivotTarget, pivotLimit, reset, flush, - pErrorCode); -} diff --git a/mtk/libshims/agps/ssl.c b/mtk/libshims/agps/ssl.c deleted file mode 100644 index f028d98..0000000 --- a/mtk/libshims/agps/ssl.c +++ /dev/null @@ -1,24 +0,0 @@ -#include <openssl/ssl.h> - -long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) { - switch (cmd) { - case 8: { /* SSL_CTRL_GET_SESSION_REUSED */ - return SSL_session_reused(s); - } - default: break; - } - return -1; -} - -long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) { - switch (cmd) { - case 32: { /* SSL_CTRL_OPTIONS */ - return SSL_CTX_set_options(ctx, larg); - } - case 44: { /* SSL_CTRL_SET_SESS_CACHE_MODE */ - return SSL_CTX_set_session_cache_mode(ctx, larg); - } - default: break; - } - return -1; -} |
