diff --git a/extlibs/android/extlibs/Android.mk b/extlibs/android/extlibs/Android.mk index 9ccf0c4b..3d99f41e 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 afc78c6d..00000000 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 00000000..cf6e7e73 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 6b7f4ec3..80b51d47 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 75110b43..88c770f0 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 4dbe34dd..00000000 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 00000000..a90d769e 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 e9582c6b..00000000 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 00000000..e65a8805 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 ab7efd1b..00000000 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 00000000..eeccd7fc 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 def7764e..00000000 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 00000000..fed5872a 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 c2ba8746..6837f7f3 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 8280d242..00000000 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 00000000..cc95fada 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 87b016d2..66966341 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 668e0814..1e535bce 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 707db310..00000000 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 00000000..4b62c993 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 60a65f8c..00000000 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 00000000..37af93d2 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 94a339b9..00000000 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 00000000..fe43deb4 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 3c329cea..00000000 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 00000000..872ba984 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 3f596002..7d6869c6 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 540d698c..00000000 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 1d4d3147..a0161ee6 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 3dcd9cdd..1d1ae0ab 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 5b3624f7..00000000 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 b67cedaf..00000000 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 7c88b1d7..00000000 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 236c80a9..00000000 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 bf950cce..00000000 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 89c0b9f6..00000000 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 00000000..63576a3e 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 5bec7a69..83140542 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 74b0a4ce..ce11c508 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 b734612f..00000000 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 00000000..367502b3 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 a3b5c9ba..00000000 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 00000000..389fcff5 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 46622b29..00000000 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 00000000..1396798f 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 87c9b533..00000000 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 00000000..26355c1d 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 3bddeb30..c2937515 Binary files a/extlibs/android/extlibs/lib/x86/libvorbisenc.a and b/extlibs/android/extlibs/lib/x86/libvorbisenc.so differ