[Android] Removed ogg, FLAC, vorbis and vorbisenc dependencies

extlibs/android/extlibs/Android.mk

@@ -12,40 +12,14 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libjpeg.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := ogg
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libogg.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := flac
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libFLAC.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vorbis
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libvorbis.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vorbisenc
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libvorbisenc.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := sndfile
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsndfile.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := ogg flac vorbis vorbisenc
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := openal
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libopenal.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := ogg flac vorbis vorbisenc
 include $(PREBUILT_SHARED_LIBRARY)

src/SFML/Android.mk

@@ -4,7 +4,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-system
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_LDLIBS := -llog -landroid
 
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -12,7 +11,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-window
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-window.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_LDLIBS := -lEGL
+LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid
 LOCAL_SHARED_LIBRARIES := sfml-system
 
 include $(PREBUILT_SHARED_LIBRARY)
@@ -21,10 +20,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-graphics
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-#LOCAL_EXPORT_LDLIBS := -lGLESv1_CM
-
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/extlibs/include
-LOCAL_SHARED_LIBRARIES := freetype jpeg
 LOCAL_SHARED_LIBRARIES += sfml-system sfml-window
 
 include $(PREBUILT_SHARED_LIBRARY)
@@ -33,9 +28,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-audio
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-#LOCAL_EXPORT_LDLIBS := -lOpenSLES
-LOCAL_SHARED_LIBRARIES := openal sndfile
-LOCAL_SHARED_LIBRARIES += sfml-system sfml-window
+LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal sndfile
 
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -51,7 +44,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-main
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-system sfml-window
+LOCAL_SHARED_LIBRARIES := sfml-window sfml-system
 
 include $(PREBUILT_STATIC_LIBRARY)
 

src/SFML/Audio/CMakeLists.txt

@@ -49,14 +49,7 @@ else()
     find_host_package(OpenAL REQUIRED)
     find_host_package(Sndfile REQUIRED)
     set(AUDIO_EXT_INCLUDE_PATHS ${OPENAL_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIR})
-    set(AUDIO_EXT_LIBS -landroid
-                       -lOpenSLES
-                       ${OPENAL_LIBRARY}
-                       ${SNDFILE_LIBRARY}
-                       ${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libvorbisenc.so
-                       ${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libvorbis.so
-                       ${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libFLAC.so
-                       ${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}/libogg.so)
+    set(AUDIO_EXT_LIBS -landroid -lOpenSLES ${OPENAL_LIBRARY} ${SNDFILE_LIBRARY})
 endif()
 
 # add include paths of external libraries

src/SFML/Main/SFMLActivity.cpp

@@ -67,7 +67,7 @@ void* loadLibrary(const char* libraryName, JNIEnv* lJNIEnv, jobject& ObjectActiv
     }
 
     // Release the Java string
-    lJNIEnv->ReleaseStringUTFChars(THESTRING, pathStr);
+    lJNIEnv->ReleaseStringUTFChars(javaLibraryPath, libraryPath);
 
     return handle;
 }
@@ -103,7 +103,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
     lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs);
 
     if (lResult == JNI_ERR) {
-        LOG("Couldn't attach the current thread to the Java virtual machine");
+        LOGE("Couldn't attach the current thread to the Java virtual machine");
         exit(1);
     }
 
@@ -137,13 +137,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
     loadLibrary("stlport_shared", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-system", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-window", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("jpeg", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("freetype", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-graphics", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("ogg", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("FLAC", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("vorbis", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("vorbisenc", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sndfile", lJNIEnv, ObjectActivityInfo);
     loadLibrary("openal", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-audio", lJNIEnv, ObjectActivityInfo);