[Android] buildsystem: factorize the maven.repo.local property setting

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 12 09:03:44 2025 +0200| [31322cf8eda473a55bfac56887ad7c14d2e83c92] | committer: Duncan McNamara

buildsystem: factorize the maven.repo.local property setting

> https://code.videolan.org/videolan/vlc-android/commit/31322cf8eda473a55bfac56887ad7c14d2e83c92
---

 buildsystem/compile.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 522f692c0d..374e908f5d 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -375,15 +375,14 @@ fi
 
 if [ "$FORCE_VLC_4" = 1 ]; then
     gradle_prop="-PforceVlc4=true"
-else
-    gradle_prop=""
 fi
+gradle_prop="$gradle_prop -Dmaven.repo.local=$M2_REPO"
 
 if [ "$BUILD_LIBVLC" = 1 ];then
-    GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" GRADLE_ABI=$GRADLE_ABI ./gradlew -Dmaven.repo.local=$M2_REPO ${gradle_prop} -p ${VLC_LIBJNI_PATH}/libvlc assemble${BUILDTYPE}
+    GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -p ${VLC_LIBJNI_PATH}/libvlc assemble${BUILDTYPE}
     RUN=0
 elif [ "$BUILD_MEDIALIB" = 1 ]; then
-    GRADLE_ABI=$GRADLE_ABI ./gradlew  ${gradle_prop} -Dmaven.repo.local=$M2_REPO -p medialibrary assemble${BUILDTYPE}
+    GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -p medialibrary assemble${BUILDTYPE}
     RUN=0
 else
     if [ "$TEST" = 1 ] || [ "$RUN" = 1 ]; then
@@ -392,14 +391,14 @@ else
         ACTION="assemble"
     fi
     TARGET="${ACTION}${BUILDTYPE}"
-    GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
+    GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} $TARGET
     if [ "$BUILDTYPE" = "Release" ] && [ "$ACTION" = "assemble" ]; then
         TARGET="bundle${BUILDTYPE}"
-        GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
+        GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} $TARGET
     fi
     if [ "$TEST" = 1 ]; then
         TARGET="application:vlc-android:install${BUILDTYPE}AndroidTest"
-        GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
+        GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" ./gradlew ${gradle_prop} $TARGET
 
         echo -e "\n===================================\nRun following for UI tests:"
         echo "adb shell am instrument -w -m -e clearPackageData true   -e package org.videolan.vlc -e debug false org.videolan.vlc.debug.test/org.videolan.vlc.MultidexTestRunner 1> result_UI_test.txt"