diff --git a/extlibs/android/extlibs/Android.mk b/extlibs/android/extlibs/Android.mk index 9ccf0c4b0..3d99f41e8 100644 --- a/extlibs/android/extlibs/Android.mk +++ b/extlibs/android/extlibs/Android.mk @@ -14,40 +14,50 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ogg -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libogg.a +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libogg.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := vorbis -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libvorbis.a -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include - -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := vorbisenc -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libvorbisenc.a -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include - -include $(PREBUILT_STATIC_LIBRARY) +include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := flac -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libFLAC.a +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libFLAC.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 -include $(PREBUILT_STATIC_LIBRARY) +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 +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 + +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 +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 + +include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := sndfile -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsndfile.a +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsndfile.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_STATIC_LIBRARY) +LOCAL_SHARED_LIBRARIES := ogg flac vorbis vorbisenc +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 + +include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := openal -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libopenal.a +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libopenal.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_STATIC_LIBRARY) +LOCAL_SHARED_LIBRARIES := ogg flac vorbis vorbisenc +TARGET_ARCH_ABI := armeabi armeabi-v7a x86 + +include $(PREBUILT_SHARED_LIBRARY) diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.a b/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.a deleted file mode 100644 index afc78c6dd..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.so b/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.so new file mode 100755 index 000000000..cf6e7e737 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi-v7a/libFLAC.so differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libfreetype.a b/extlibs/android/extlibs/lib/armeabi-v7a/libfreetype.a index 6b7f4ec31..80b51d471 100644 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libfreetype.a and b/extlibs/android/extlibs/lib/armeabi-v7a/libfreetype.a differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libjpeg.a b/extlibs/android/extlibs/lib/armeabi-v7a/libjpeg.a index 75110b435..88c770f04 100644 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libjpeg.a and b/extlibs/android/extlibs/lib/armeabi-v7a/libjpeg.a differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libogg.a b/extlibs/android/extlibs/lib/armeabi-v7a/libogg.a deleted file mode 100644 index 4dbe34dd8..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libogg.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libogg.so b/extlibs/android/extlibs/lib/armeabi-v7a/libogg.so new file mode 100755 index 000000000..a90d769ef Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi-v7a/libogg.so differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.a b/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.a deleted file mode 100644 index e9582c6b5..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.so b/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.so new file mode 100755 index 000000000..e65a88058 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi-v7a/libopenal.so differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.a b/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.a deleted file mode 100644 index ab7efd1bc..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.so b/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.so new file mode 100755 index 000000000..eeccd7fc9 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi-v7a/libsndfile.so differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.a b/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.a deleted file mode 100644 index def7764e1..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.so b/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.so new file mode 100755 index 000000000..fed5872a5 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi-v7a/libvorbis.so differ diff --git a/extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.a b/extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.so old mode 100644 new mode 100755 similarity index 89% rename from extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.a rename to extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.so index c2ba87467..6837f7f3e Binary files a/extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.a and b/extlibs/android/extlibs/lib/armeabi-v7a/libvorbisenc.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libFLAC.a b/extlibs/android/extlibs/lib/armeabi/libFLAC.a deleted file mode 100644 index 8280d2424..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi/libFLAC.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi/libFLAC.so b/extlibs/android/extlibs/lib/armeabi/libFLAC.so new file mode 100755 index 000000000..cc95fada7 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi/libFLAC.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libfreetype.a b/extlibs/android/extlibs/lib/armeabi/libfreetype.a index 87b016d2d..66966341b 100644 Binary files a/extlibs/android/extlibs/lib/armeabi/libfreetype.a and b/extlibs/android/extlibs/lib/armeabi/libfreetype.a differ diff --git a/extlibs/android/extlibs/lib/armeabi/libjpeg.a b/extlibs/android/extlibs/lib/armeabi/libjpeg.a index 668e0814e..1e535bce8 100644 Binary files a/extlibs/android/extlibs/lib/armeabi/libjpeg.a and b/extlibs/android/extlibs/lib/armeabi/libjpeg.a differ diff --git a/extlibs/android/extlibs/lib/armeabi/libogg.a b/extlibs/android/extlibs/lib/armeabi/libogg.a deleted file mode 100644 index 707db3105..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi/libogg.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi/libogg.so b/extlibs/android/extlibs/lib/armeabi/libogg.so new file mode 100755 index 000000000..4b62c9935 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi/libogg.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libopenal.a b/extlibs/android/extlibs/lib/armeabi/libopenal.a deleted file mode 100644 index 60a65f8c4..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi/libopenal.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi/libopenal.so b/extlibs/android/extlibs/lib/armeabi/libopenal.so new file mode 100755 index 000000000..37af93d2e Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi/libopenal.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libsndfile.a b/extlibs/android/extlibs/lib/armeabi/libsndfile.a deleted file mode 100644 index 94a339b98..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi/libsndfile.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi/libsndfile.so b/extlibs/android/extlibs/lib/armeabi/libsndfile.so new file mode 100755 index 000000000..fe43deb42 Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi/libsndfile.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libvorbis.a b/extlibs/android/extlibs/lib/armeabi/libvorbis.a deleted file mode 100644 index 3c329ceab..000000000 Binary files a/extlibs/android/extlibs/lib/armeabi/libvorbis.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/armeabi/libvorbis.so b/extlibs/android/extlibs/lib/armeabi/libvorbis.so new file mode 100755 index 000000000..872ba984d Binary files /dev/null and b/extlibs/android/extlibs/lib/armeabi/libvorbis.so differ diff --git a/extlibs/android/extlibs/lib/armeabi/libvorbisenc.a b/extlibs/android/extlibs/lib/armeabi/libvorbisenc.so old mode 100644 new mode 100755 similarity index 88% rename from extlibs/android/extlibs/lib/armeabi/libvorbisenc.a rename to extlibs/android/extlibs/lib/armeabi/libvorbisenc.so index 3f5960026..7d6869c61 Binary files a/extlibs/android/extlibs/lib/armeabi/libvorbisenc.a and b/extlibs/android/extlibs/lib/armeabi/libvorbisenc.so differ diff --git a/extlibs/android/extlibs/lib/mips/libFLAC.a b/extlibs/android/extlibs/lib/mips/libFLAC.a deleted file mode 100644 index 540d698cb..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libFLAC.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/mips/libfreetype.a b/extlibs/android/extlibs/lib/mips/libfreetype.a index 1d4d31474..a0161ee6d 100644 Binary files a/extlibs/android/extlibs/lib/mips/libfreetype.a and b/extlibs/android/extlibs/lib/mips/libfreetype.a differ diff --git a/extlibs/android/extlibs/lib/mips/libjpeg.a b/extlibs/android/extlibs/lib/mips/libjpeg.a index 3dcd9cddb..1d1ae0ab0 100644 Binary files a/extlibs/android/extlibs/lib/mips/libjpeg.a and b/extlibs/android/extlibs/lib/mips/libjpeg.a differ diff --git a/extlibs/android/extlibs/lib/mips/libogg.a b/extlibs/android/extlibs/lib/mips/libogg.a deleted file mode 100644 index 5b3624f77..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libogg.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/mips/libopenal.a b/extlibs/android/extlibs/lib/mips/libopenal.a deleted file mode 100644 index b67cedaff..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libopenal.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/mips/libsndfile.a b/extlibs/android/extlibs/lib/mips/libsndfile.a deleted file mode 100644 index 7c88b1d78..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libsndfile.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/mips/libvorbis.a b/extlibs/android/extlibs/lib/mips/libvorbis.a deleted file mode 100644 index 236c80a95..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libvorbis.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/mips/libvorbisenc.a b/extlibs/android/extlibs/lib/mips/libvorbisenc.a deleted file mode 100644 index bf950ccea..000000000 Binary files a/extlibs/android/extlibs/lib/mips/libvorbisenc.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libFLAC.a b/extlibs/android/extlibs/lib/x86/libFLAC.a deleted file mode 100644 index 89c0b9f60..000000000 Binary files a/extlibs/android/extlibs/lib/x86/libFLAC.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libFLAC.so b/extlibs/android/extlibs/lib/x86/libFLAC.so new file mode 100755 index 000000000..63576a3e9 Binary files /dev/null and b/extlibs/android/extlibs/lib/x86/libFLAC.so differ diff --git a/extlibs/android/extlibs/lib/x86/libfreetype.a b/extlibs/android/extlibs/lib/x86/libfreetype.a index 5bec7a693..831405427 100644 Binary files a/extlibs/android/extlibs/lib/x86/libfreetype.a and b/extlibs/android/extlibs/lib/x86/libfreetype.a differ diff --git a/extlibs/android/extlibs/lib/x86/libjpeg.a b/extlibs/android/extlibs/lib/x86/libjpeg.a index 74b0a4ce1..ce11c5087 100644 Binary files a/extlibs/android/extlibs/lib/x86/libjpeg.a and b/extlibs/android/extlibs/lib/x86/libjpeg.a differ diff --git a/extlibs/android/extlibs/lib/x86/libogg.a b/extlibs/android/extlibs/lib/x86/libogg.a deleted file mode 100644 index b734612f5..000000000 Binary files a/extlibs/android/extlibs/lib/x86/libogg.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libogg.so b/extlibs/android/extlibs/lib/x86/libogg.so new file mode 100755 index 000000000..367502b3c Binary files /dev/null and b/extlibs/android/extlibs/lib/x86/libogg.so differ diff --git a/extlibs/android/extlibs/lib/x86/libopenal.a b/extlibs/android/extlibs/lib/x86/libopenal.a deleted file mode 100644 index a3b5c9bab..000000000 Binary files a/extlibs/android/extlibs/lib/x86/libopenal.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libopenal.so b/extlibs/android/extlibs/lib/x86/libopenal.so new file mode 100755 index 000000000..389fcff53 Binary files /dev/null and b/extlibs/android/extlibs/lib/x86/libopenal.so differ diff --git a/extlibs/android/extlibs/lib/x86/libsndfile.a b/extlibs/android/extlibs/lib/x86/libsndfile.a deleted file mode 100644 index 46622b29f..000000000 Binary files a/extlibs/android/extlibs/lib/x86/libsndfile.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libsndfile.so b/extlibs/android/extlibs/lib/x86/libsndfile.so new file mode 100755 index 000000000..1396798f4 Binary files /dev/null and b/extlibs/android/extlibs/lib/x86/libsndfile.so differ diff --git a/extlibs/android/extlibs/lib/x86/libvorbis.a b/extlibs/android/extlibs/lib/x86/libvorbis.a deleted file mode 100644 index 87c9b533c..000000000 Binary files a/extlibs/android/extlibs/lib/x86/libvorbis.a and /dev/null differ diff --git a/extlibs/android/extlibs/lib/x86/libvorbis.so b/extlibs/android/extlibs/lib/x86/libvorbis.so new file mode 100755 index 000000000..26355c1df Binary files /dev/null and b/extlibs/android/extlibs/lib/x86/libvorbis.so differ diff --git a/extlibs/android/extlibs/lib/x86/libvorbisenc.a b/extlibs/android/extlibs/lib/x86/libvorbisenc.so old mode 100644 new mode 100755 similarity index 88% rename from extlibs/android/extlibs/lib/x86/libvorbisenc.a rename to extlibs/android/extlibs/lib/x86/libvorbisenc.so index 3bddeb302..c2937515c Binary files a/extlibs/android/extlibs/lib/x86/libvorbisenc.a and b/extlibs/android/extlibs/lib/x86/libvorbisenc.so differ