Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ktaglib: fix more build issues

Browse source
This commit is contained in:
Alexander Capehart 2024-12-12 12:36:49 -07:00
parent c7dfae5262
commit 1289922cd9
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ktaglib/build.gradle
View file

@ -50,7 +50,7 @@ task assembleTaglib(type: Exec) {
commandLine "true" commandLine "true"
return return
} }
commandLine "sh", "-c", "$jniDir/build_taglib.sh $android.ndkDirectory" commandLine "sh", "-c", "$jniDir/build_taglib.sh $jniDir $android.ndkDirectory"
} }
afterEvaluate { afterEvaluate {
@ -60,4 +60,5 @@ afterEvaluate {
clean { clean {
delete "$projectDir/src/main/cpp/taglib/pkg" delete "$projectDir/src/main/cpp/taglib/pkg"
delete "$projectDir/src/main/cpp/taglib/build"
} }

17
ktaglib/src/main/cpp/build_taglib.sh
View file

@ -1,10 +1,13 @@
set -e set -e
SRC_DIR=$(pwd) WORKING_DIR=$1
TAGLIB_SRC_DIR=${SRC_DIR}/taglib echo "Working directory is at $WORKING_DIR"
TAGLIB_DST_DIR=${SRC_DIR}/taglib/build cd "$WORKING_DIR"
TAGLIB_PKG_DIR=${SRC_DIR}/taglib/pkg
NDK_TOOLCHAIN=${SRC_DIR}/android.toolchain.cmake TAGLIB_SRC_DIR=${WORKING_DIR}/taglib
NDK_PATH=$1 TAGLIB_DST_DIR=${WORKING_DIR}/taglib/build
TAGLIB_PKG_DIR=${WORKING_DIR}/taglib/pkg
NDK_TOOLCHAIN=${WORKING_DIR}/android.toolchain.cmake
NDK_PATH=$2
echo "Taglib source is at $TAGLIB_SRC_DIR" echo "Taglib source is at $TAGLIB_SRC_DIR"
echo "Taglib build is at $TAGLIB_DST_DIR" echo "Taglib build is at $TAGLIB_DST_DIR"
echo "Taglib package is at $TAGLIB_PKG_DIR" echo "Taglib package is at $TAGLIB_PKG_DIR"
@ -26,7 +29,7 @@ build_for_arch() {
-DANDROID_ABI=$ARCH -DBUILD_SHARED_LIBS=OFF -DVISIBILITY_HIDDEN=ON -DBUILD_TESTING=OFF \ -DANDROID_ABI=$ARCH -DBUILD_SHARED_LIBS=OFF -DVISIBILITY_HIDDEN=ON -DBUILD_TESTING=OFF \
-DBUILD_EXAMPLES=OFF -DBUILD_BINDINGS=OFF -DWITH_ZLIB=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_BINDINGS=OFF -DWITH_ZLIB=OFF -DCMAKE_BUILD_TYPE=Release
cmake --build $DST_DIR --config Release cmake --build $DST_DIR --config Release
cd $SRC_DIR cd $WORKING_DIR
cmake --install $DST_DIR --config Release --prefix $PKG_DIR --strip cmake --install $DST_DIR --config Release --prefix $PKG_DIR --strip
} }