diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh index 2fdf7b5a8..6de1a85f5 100755 --- a/buildsystem/compile-medialibrary.sh +++ b/buildsystem/compile-medialibrary.sh @@ -181,11 +181,12 @@ printf 'cpu = '"'"'%s'"'"'\n' "${MESON_CPU}" >&3 if [ ! -d "build-android-$ANDROID_ABI/" ] || [ ! -f "build-android-$ANDROID_ABI/build.ninja" ]; then PKG_CONFIG_LIBDIR="$LIBVLCJNI_SRC_DIR/vlc/build-android-${TARGET_TUPLE}/install/lib/pkgconfig" \ PKG_CONFIG_PATH="${MEDIALIBRARY_PREFIX}/lib/pkgconfig:$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib/pkgconfig/" \ - meson \ + meson setup \ -Ddebug=true \ -Doptimization=${MEDIALIBRARY_OPTIMIZATION} \ -Db_ndebug=${MEDIALIBRARY_NDEBUG} \ -Ddefault_library=static \ + --prefix "${MEDIALIBRARY_PREFIX}" \ --cross-file crossfile-${ANDROID_ABI}-android-${ANDROID_API}.meson \ -Dlibjpeg_prefix="$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/" \ -Dtests=disabled \ @@ -201,8 +202,8 @@ avlc_checkfail "medialibrary: meson failed" ############ echo -e "\e[1m\e[32mBuilding medialibrary\e[0m" -cd "build-android-$ANDROID_ABI/"; -ninja +meson compile -C "build-android-$ANDROID_ABI" +meson install -C "build-android-$ANDROID_ABI" avlc_checkfail "medialibrary: build failed" diff --git a/medialibrary/jni/Android.mk b/medialibrary/jni/Android.mk index 20704bbfa..2316034e5 100644 --- a/medialibrary/jni/Android.mk +++ b/medialibrary/jni/Android.mk @@ -2,12 +2,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := medialibrary -LOCAL_SRC_FILES := ../medialibrary/build-android-$(APP_ABI)/src/libmedialibrary.a +LOCAL_SRC_FILES := ../prefix/${APP_PLATFORM}-${APP_ABI}/lib/libmedialibrary.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := sqlite -LOCAL_SRC_FILES := ../$(SQLITE_RELEASE)/build-$(APP_ABI)/.libs/libsqlite3.a +LOCAL_SRC_FILES := ../prefix/${APP_PLATFORM}-${APP_ABI}/lib/libsqlite3.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS)