Use modern dbus-java fork, add experimental D-Bus MediaService

AsteroidOS · May 3, 2024 · 5c85a4c · 5c85a4c
1 parent 97694fe
commit 5c85a4c
Show file tree

Hide file tree

Showing 161 changed files with 2,274 additions and 19,375 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,19 +1,22 @@
 plugins {
     id("com.android.application")
+    kotlin("android")
 }
 
 android {
-    compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "org.asteroidos.sync"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 29
         versionName = "0.29"
         ndk.abiFilters.clear()
         ndk.abiFilters.add("arm64-v8a")
+        ndk.abiFilters.add("armeabi-v7a")
+        ndk.abiFilters.add("x86")
+        ndk.abiFilters.add("x86_64")
         externalNativeBuild {
             cmake {
                 cppFlags += ""
@@ -39,7 +42,7 @@ android {
                 srcDir("src/main/lib/powerampapi/poweramp_api_lib/res/")
             }
             jniLibs {
-                srcDir("/work/android-root/lib")
+                srcDir("/tmp/android-root/lib")
             }
         }
     }
@@ -48,6 +51,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     lint {
         checkReleaseBuilds = true
         disable += "MissingTranslation"
@@ -80,4 +87,11 @@ dependencies {
     implementation("no.nordicsemi.android.support.v18:scanner:1.6.0")
     implementation("no.nordicsemi.android:ble:2.7.2")
     implementation("com.google.guava:guava:33.1.0-android")
+    implementation("com.github.hypfvieh:dbus-java-core:5.0.0")
+    implementation("com.github.hypfvieh:dbus-java-transport-tcp:5.0.0")
+    implementation("androidx.media3:media3-session:1.3.1")
+    implementation("androidx.media3:media3-common:1.3.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1-Beta")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1-Beta")
+
 }
diff --git a/app/src/main/cpp/build_depends.sh b/app/src/main/cpp/build_depends.sh
@@ -118,7 +118,7 @@ EOF.
 +++ meson.build        2024-04-27 11:44:38.569868768 +0200
 @@ -2170 +2170 @@
 -  libiconv = dependency('iconv')
-+  libiconv = [cc.find_library('iconv', required : true, dirs : ['/work/android-root/lib'])]
++  libiconv = [cc.find_library('iconv', required : true, dirs : ['${PREFIX}/lib/${ABI}'])]
 EOF.
 
 
@@ -130,4 +130,4 @@ EOF.
   >&2 ninja -C ./_builddir/ install
   >&2 echo "All depends ready"
 
-popd
+popd