From 6216e1d59143663a63bc9600b23f52c2a17de7b7 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Tue, 4 Feb 2025 16:20:48 -0700
Subject: [PATCH] musikr: move taglib to new rust module

---
 .gitmodules                                  |  6 +--
 media                                        |  2 +-
 musikr/build.gradle                          | 40 ++++++++++----------
 musikr/src/main/cpp/taglib                   |  1 -
 musikr/src/main/{cpp => jni}/build_taglib.sh |  0
 musikr/src/main/jni/taglib                   |  1 +
 6 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 160000 musikr/src/main/cpp/taglib
 rename musikr/src/main/{cpp => jni}/build_taglib.sh (100%)
 create mode 160000 musikr/src/main/jni/taglib

diff --git a/.gitmodules b/.gitmodules
index 55d1a1cbd..caa6aabf8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
+	tag = v2.0.2	
diff --git a/media b/media
index 9a0e432c0..4b3084e1b 160000
--- a/media
+++ b/media
@@ -1 +1 @@
-Subproject commit 9a0e432c08ee572056f99b9c26d9657753c87fe2
+Subproject commit 4b3084e1b63185eaeffa7cac9d7015040e0e2aa5
diff --git a/musikr/build.gradle b/musikr/build.gradle
index 1f3f5255c..7e011d7a7 100644
--- a/musikr/build.gradle
+++ b/musikr/build.gradle
@@ -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"
+//}
diff --git a/musikr/src/main/cpp/taglib b/musikr/src/main/cpp/taglib
deleted file mode 160000
index 648f5e588..000000000
--- a/musikr/src/main/cpp/taglib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 648f5e588209464702e4955de614e391d3768ec8
diff --git a/musikr/src/main/cpp/build_taglib.sh b/musikr/src/main/jni/build_taglib.sh
similarity index 100%
rename from musikr/src/main/cpp/build_taglib.sh
rename to musikr/src/main/jni/build_taglib.sh
diff --git a/musikr/src/main/jni/taglib b/musikr/src/main/jni/taglib
new file mode 160000
index 000000000..ee1931b81
--- /dev/null
+++ b/musikr/src/main/jni/taglib
@@ -0,0 +1 @@
+Subproject commit ee1931b81116cd0091c906896f6f4fb74850be51