Fixed bug 3789 - Android : small clean up
authorSam Lantinga <slouken@libsdl.org>
Wed, 30 Aug 2017 14:25:01 -0700
changeset 11429424d7476f72d
parent 11428 befae2925565
child 11430 884105e0943f
Fixed bug 3789 - Android : small clean up

Sylvain

Since https://hg.libsdl.org/SDL/rev/a8c29f5b679f
SDL_android_main.c is empty and then produce a warning
nativeInit does not exist and dont need to be mark undefined
Android.mk
CMakeLists.txt
android-project/jni/src/Android.mk
     1.1 --- a/Android.mk	Wed Aug 30 09:44:38 2017 -0700
     1.2 +++ b/Android.mk	Wed Aug 30 14:25:01 2017 -0700
     1.3 @@ -61,10 +61,8 @@
     1.4  
     1.5  LOCAL_MODULE_FILENAME := libSDL2
     1.6  
     1.7 -LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
     1.8 -
     1.9  LOCAL_LDLIBS := 
    1.10 -LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
    1.11 +LOCAL_EXPORT_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
    1.12  
    1.13  include $(BUILD_STATIC_LIBRARY)
    1.14  
    1.15 @@ -82,8 +80,6 @@
    1.16  
    1.17  LOCAL_MODULE_FILENAME := libSDL2main
    1.18  
    1.19 -LOCAL_SRC_FILES := $(LOCAL_PATH)/src/main/android/SDL_android_main.c
    1.20 -
    1.21  include $(BUILD_STATIC_LIBRARY)
    1.22  
    1.23  
     2.1 --- a/CMakeLists.txt	Wed Aug 30 09:44:38 2017 -0700
     2.2 +++ b/CMakeLists.txt	Wed Aug 30 14:25:01 2017 -0700
     2.3 @@ -876,7 +876,6 @@
     2.4  
     2.5    CheckPTHREAD()
     2.6  
     2.7 -  list(APPEND EXTRA_LDFLAGS "-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit")
     2.8  endif()
     2.9  
    2.10  # Platform-specific options and settings
     3.1 --- a/android-project/jni/src/Android.mk	Wed Aug 30 09:44:38 2017 -0700
     3.2 +++ b/android-project/jni/src/Android.mk	Wed Aug 30 14:25:01 2017 -0700
     3.3 @@ -9,8 +9,7 @@
     3.4  LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
     3.5  
     3.6  # Add your application source files here...
     3.7 -LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     3.8 -	YourSourceHere.c
     3.9 +LOCAL_SRC_FILES := YourSourceHere.c
    3.10  
    3.11  LOCAL_SHARED_LIBRARIES := SDL2
    3.12