Fixed bug 3789 - Android : small clean up

Sylvain Since https://hg.libsdl.org/SDL/rev/6546daa45a02 SDL_android_main.c is empty and then produce a warning nativeInit does not exist and dont need to be mark undefined
libsdl-org · Aug 30, 2017 · 347fe70 · 347fe70
1 parent b5f31c3
commit 347fe70
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/Android.mk b/Android.mk
@@ -61,10 +61,8 @@ LOCAL_MODULE := SDL2_static
 
 LOCAL_MODULE_FILENAME := libSDL2
 
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
-
 LOCAL_LDLIBS := 
-LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
+LOCAL_EXPORT_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -82,8 +80,6 @@ LOCAL_MODULE := SDL2_main
 
 LOCAL_MODULE_FILENAME := libSDL2main
 
-LOCAL_SRC_FILES := $(LOCAL_PATH)/src/main/android/SDL_android_main.c
-
 include $(BUILD_STATIC_LIBRARY)
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -876,7 +876,6 @@ if(ANDROID)
 
   CheckPTHREAD()
 
-  list(APPEND EXTRA_LDFLAGS "-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit")
 endif()
 
 # Platform-specific options and settings

diff --git a/android-project/jni/src/Android.mk b/android-project/jni/src/Android.mk
@@ -9,8 +9,7 @@ SDL_PATH := ../SDL
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
 
 # Add your application source files here...
-LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
-	YourSourceHere.c
+LOCAL_SRC_FILES := YourSourceHere.c
 
 LOCAL_SHARED_LIBRARIES := SDL2