musikr: move taglib to new rust module

This commit is contained in:
Alexander Capehart 2025-02-04 16:20:48 -07:00
parent d6cf484d61
commit 6216e1d591
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
6 changed files with 25 additions and 25 deletions

4
.gitmodules vendored
View file

@ -2,7 +2,7 @@
path = media
url = https://github.com/OxygenCobalt/media.git
[submodule "musikr/src/main/cpp/taglib"]
path = musikr/src/main/cpp/taglib
[submodule "musikr/src/main/jni/taglib"]
path = musikr/src/main/jni/taglib
url = https://github.com/taglib/taglib.git
tag = v2.0.2

2
media

@ -1 +1 @@
Subproject commit 9a0e432c08ee572056f99b9c26d9657753c87fe2
Subproject commit 4b3084e1b63185eaeffa7cac9d7015040e0e2aa5

View file

@ -78,23 +78,23 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
task assembleTaglib(type: Exec) {
def jniDir = "$projectDir/src/main/cpp"
def libs = new File("$jniDir/taglib/pkg")
if (libs.exists()) {
commandLine "true"
return
}
commandLine "sh", "-c", "$jniDir/build_taglib.sh $jniDir $android.ndkDirectory"
}
afterEvaluate {
preDebugBuild.dependsOn assembleTaglib
preReleaseBuild.dependsOn assembleTaglib
}
clean {
delete "$projectDir/src/main/cpp/taglib/pkg"
delete "$projectDir/src/main/cpp/taglib/build"
}
//
//task assembleTaglib(type: Exec) {
// def jniDir = "$projectDir/src/main/cpp"
// def libs = new File("$jniDir/taglib/pkg")
// if (libs.exists()) {
// commandLine "true"
// return
// }
// commandLine "sh", "-c", "$jniDir/build_taglib.sh $jniDir $android.ndkDirectory"
//}
//
//afterEvaluate {
// preDebugBuild.dependsOn assembleTaglib
// preReleaseBuild.dependsOn assembleTaglib
//}
//
//clean {
// delete "$projectDir/src/main/cpp/taglib/pkg"
// delete "$projectDir/src/main/cpp/taglib/build"
//}

@ -1 +0,0 @@
Subproject commit 648f5e588209464702e4955de614e391d3768ec8

@ -0,0 +1 @@
Subproject commit ee1931b81116cd0091c906896f6f4fb74850be51