diff --git a/app/Android.bp b/app/Android.bp
index d15269d2..f1331b85 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -13,7 +13,6 @@ android_app {
 
     srcs: [
         "src/main/java/**/*.kt",
-        "src_aosp/main/java/**/*.kt",
     ],
 
     product_specific: true,
diff --git a/app/src/main/java/org/lineageos/recorder/ListActivity.kt b/app/src/main/java/org/lineageos/recorder/ListActivity.kt
index 3b37e1c1..69a61b9c 100644
--- a/app/src/main/java/org/lineageos/recorder/ListActivity.kt
+++ b/app/src/main/java/org/lineageos/recorder/ListActivity.kt
@@ -204,6 +204,7 @@ class ListActivity : AppCompatActivity(), RecordingListCallbacks {
     private fun loadRecordings() {
         taskExecutor.runTask(
             GetRecordingsTask(
+                applicationContext.packageName,
                 contentResolver
             )
         ) { list: List<RecordingData> ->
diff --git a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.kt b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.kt
index 0b8c1866..b725a0c6 100644
--- a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.kt
+++ b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.kt
@@ -31,7 +31,6 @@ import android.util.Log
 import androidx.annotation.GuardedBy
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
-import org.lineageos.recorder.BuildConfig
 import org.lineageos.recorder.ListActivity
 import org.lineageos.recorder.R
 import org.lineageos.recorder.RecorderActivity
@@ -568,10 +567,10 @@ class SoundRecorderService : Service() {
     companion object {
         private const val TAG = "SoundRecorderService"
 
-        const val ACTION_START = "${BuildConfig.APPLICATION_ID}.service.START"
-        const val ACTION_STOP = "${BuildConfig.APPLICATION_ID}.service.STOP"
-        const val ACTION_PAUSE = "${BuildConfig.APPLICATION_ID}.service.PAUSE"
-        const val ACTION_RESUME = "${BuildConfig.APPLICATION_ID}.service.RESUME"
+        const val ACTION_START = "START"
+        const val ACTION_STOP = "STOP"
+        const val ACTION_PAUSE = "PAUSE"
+        const val ACTION_RESUME = "RESUME"
 
         const val MSG_REGISTER_CLIENT = 0
         const val MSG_UNREGISTER_CLIENT = 1
diff --git a/app/src/main/java/org/lineageos/recorder/task/GetRecordingsTask.kt b/app/src/main/java/org/lineageos/recorder/task/GetRecordingsTask.kt
index eb4c87d8..97348d33 100644
--- a/app/src/main/java/org/lineageos/recorder/task/GetRecordingsTask.kt
+++ b/app/src/main/java/org/lineageos/recorder/task/GetRecordingsTask.kt
@@ -8,7 +8,6 @@ package org.lineageos.recorder.task
 import android.content.ContentResolver
 import android.content.ContentUris
 import android.provider.MediaStore
-import org.lineageos.recorder.BuildConfig
 import org.lineageos.recorder.list.RecordingData
 import java.time.Instant
 import java.time.LocalDateTime
@@ -16,6 +15,7 @@ import java.time.ZoneId
 import java.util.concurrent.Callable
 
 class GetRecordingsTask(
+    private val packageName: String,
     private val contentResolver: ContentResolver,
 ) : Callable<List<RecordingData>> {
     override fun call(): List<RecordingData> {
@@ -26,7 +26,7 @@ class GetRecordingsTask(
             PROJECTION,
             "${MediaStore.Audio.Media.OWNER_PACKAGE_NAME}=?",
             arrayOf(
-                BuildConfig.APPLICATION_ID,
+                packageName,
             ),
             MY_RECORDS_SORT
         )?.use { cursor ->
diff --git a/app/src_aosp/main/java/org/lineageos/recorder/BuildConfig.kt b/app/src_aosp/main/java/org/lineageos/recorder/BuildConfig.kt
deleted file mode 100644
index 401b47c3..00000000
--- a/app/src_aosp/main/java/org/lineageos/recorder/BuildConfig.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.lineageos.recorder
-
-object BuildConfig {
-    const val APPLICATION_ID = "org.lineageos.recorder"
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..a4b76b95 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 864d6c47..9355b415 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f..9d21a218 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail