all: cleanup

OxygenCobalt · Dec 23, 2024 · 77f97ef · 77f97ef
1 parent 07118a5
commit 77f97ef
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,6 +31,7 @@ plugins {
     id 'com.android.library' version "$agp_version" apply false
     id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
     id "com.google.devtools.ksp" version '2.0.21-1.0.25' apply false
+    // We use spotless in the root build.gradle to apply to all module
     id "com.diffplug.spotless" version "6.25.0" apply true
 }
 

diff --git a/musikr/src/main/cpp/CMakeLists.txt b/musikr/src/main/cpp/CMakeLists.txt
@@ -42,20 +42,20 @@ set_target_properties(
         ${taglib_file_path}
         INTERFACE_INCLUDE_DIRECTORIES
         ${taglib_include})
-
 add_library(${CMAKE_PROJECT_NAME} SHARED
         # List C/C++ source files with relative paths to this CMakeLists.txt.
         taglib_jni.cpp
         JVMInputStream.cpp
         JVMTagMap.cpp
         JVMMetadataBuilder.cpp
 )
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
+target_link_options(${CMAKE_PROJECT_NAME}
         # @Tolriq found that these flags can reduce the size of the linked
         # taglib + jni shim shared library. Kudos to them.
         # https://github.com/taglib/taglib/issues/1212#issuecomment-2326456903
-        LINK_FLAGS
-        "-Wl,--exclude-libs,ALL")
+        # Additionally, enable 16kb page size. I believe taglib can support this fine,
+        # as a cursory glance indicates that it doesn't hardcode any page sizes.
+        PRIVATE "-Wl,--exclude-libs,ALL,-z,max-page-size=16384")
 
 # Specifies libraries CMake should link to your target library. You
 # can link libraries from various origins, such as libraries defined in this
@@ -64,4 +64,4 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         # List libraries link to the target library
         PRIVATE android
         PRIVATE log
-        PRIVATE taglib)
+        PRIVATE taglib)
diff --git a/musikr/src/main/cpp/JVMInputStream.cpp b/musikr/src/main/cpp/JVMInputStream.cpp
@@ -21,7 +21,6 @@
 #include <cmath>
 
 // TODO: Handle stream exceptions
-
 JVMInputStream::JVMInputStream(JNIEnv *env, jobject inputStream) : env(env), inputStream(
 		inputStream) {
 	if (!env->IsInstanceOf(inputStream,
@@ -106,7 +105,7 @@ void JVMInputStream::seek(TagLib::offset_t offset, Position p) {
 }
 
 void JVMInputStream::clear() {
-    // Nothing to do
+	// Nothing to do
 }
 
 TagLib::offset_t JVMInputStream::tell() const {

diff --git a/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt b/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt
@@ -18,7 +18,6 @@
 
 package org.oxycblt.musikr.metadata
 
-import android.content.Context
 import android.os.ParcelFileDescriptor
 import java.io.FileInputStream
 import kotlinx.coroutines.Dispatchers

diff --git a/musikr/src/main/java/org/oxycblt/musikr/metadata/TagLibJNI.kt b/musikr/src/main/java/org/oxycblt/musikr/metadata/TagLibJNI.kt
@@ -18,7 +18,6 @@
 
 package org.oxycblt.musikr.metadata
 
-import android.content.Context
 import java.io.FileInputStream
 
 internal object TagLibJNI {