Browse Source

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
Sam Lantinga 7 years ago
parent
commit
347fe70432
3 changed files with 2 additions and 8 deletions
  1. 1 5
      Android.mk
  2. 0 1
      CMakeLists.txt
  3. 1 2
      android-project/jni/src/Android.mk

+ 1 - 5
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)
 
 

+ 0 - 1
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

+ 1 - 2
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