diff options
| -rw-r--r-- | samsung_symbols/Android.mk | 3 | ||||
| -rw-r--r-- | samsung_symbols/symbols.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/samsung_symbols/Android.mk b/samsung_symbols/Android.mk index 292bb89..bd57ebb 100644 --- a/samsung_symbols/Android.mk +++ b/samsung_symbols/Android.mk @@ -1,3 +1,4 @@ +# # Copyright (C) 2016 The CyanogenMod Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,4 +25,4 @@ LOCAL_MODULE := libsamsung_symbols LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/samsung_symbols/symbols.cpp b/samsung_symbols/symbols.cpp index 9c81192..b4be80c 100644 --- a/samsung_symbols/symbols.cpp +++ b/samsung_symbols/symbols.cpp @@ -16,7 +16,6 @@ #include <stdlib.h> #include <malloc.h> -#include "../upstream-dlmalloc/malloc.c" extern "C" int _ZN7android6Parcel13writeString16EPKDsj(); extern "C" int _ZN7android6Parcel13writeString16EPKtj(){ @@ -44,7 +43,7 @@ extern "C" void *CRYPTO_malloc(int num, const char *file, int line){ if (num <= 0) return NULL; else - return dlmalloc(num); + return malloc(num); } extern "C" void RIL_register_socket(); @@ -54,13 +53,12 @@ extern "C" int MsgHeader_fields = NULL; extern "C" int RIL_SIM_SAP_DISCONNECT_REQ_fields = NULL; -extern "C" char GetClientData(); -extern "C" char GetClientData() { - return NULL; -} +extern "C" void GetClientData(); +extern "C" void GetClientData() {} extern "C" void SetClientData(char); extern "C" void SetClientData(char) {} extern "C" void Connect_RILD_Second(); extern "C" void Connect_RILD_Second() {} + |