miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: renamed libcrypto and libssl to avoid clashing with system libraries, fixed crashes in SD card Java code

Browse Source
This commit is contained in:
Sergii Pylypenko
2016-06-10 19:43:32 +03:00
parent 90cc2821a6
commit cbd8374185
11 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/openssl/Android.mk
View File

@@ -3,16 +3,18 @@ LOCAL_PATH:=$(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := $(notdir $(LOCAL_PATH))
LOCAL_MODULE_FILENAME := lib$(notdir $(LOCAL_PATH)).so.sdl.0 # It clashes with system libcrypto and libssl in Android 4.3 and older
ifneq (openssl,$(LOCAL_MODULE))
ifneq ($(filter arm mips x86, $(TARGET_ARCH)),)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := lib-$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
LOCAL_SRC_FILES := lib-$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so.sdl.0.so
LOCAL_BUILT_MODULE := # This fixes a bug in NDK r10d
# NDK is buggy meh
obj/local/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so: $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
obj/local/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so.sdl.0.so: $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
cp -f $< $@
include $(PREBUILT_SHARED_LIBRARY)