[Android] buildsystem: pass the forceVlc4 flag when calling gradle wrapper

Steve Lhomme git at videolan.org
Tue Jul 1 07:34:50 UTC 2025


vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jun 24 08:17:24 2025 +0200| [950ccf08bbf0f802015e886df47ec6648932f012] | committer: Steve Lhomme

buildsystem: pass the forceVlc4 flag when calling gradle wrapper

Otherwise it may fail on unsupported things for VLC3.

> https://code.videolan.org/videolan/vlc-android/commit/950ccf08bbf0f802015e886df47ec6648932f012
---

 buildsystem/compile.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 045d261e47..700a6118e9 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -248,6 +248,10 @@ if [ ! -d "$ANDROID_SDK/licenses" ]; then
     echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_SDK/licenses/android-sdk-license"
 fi
 
+if [ "$FORCE_VLC_4" = 1 ]; then
+    gradle_prop="-PforceVlc4=true"
+fi
+
 ##########
 # GRADLE #
 ##########
@@ -263,7 +267,7 @@ if [ ! -d "gradle/wrapper" ]; then
 
     unzip -o gradle-${GRADLE_VERSION}-bin.zip || fail "gradle: unzip failed"
 
-    ./gradle-${GRADLE_VERSION}/bin/gradle wrapper || fail "gradle: wrapper failed"
+    ./gradle-${GRADLE_VERSION}/bin/gradle wrapper ${gradle_prop} || fail "gradle: wrapper failed"
 
     chmod a+x gradlew
     ./gradlew -version || fail "gradle: wrapper failed"
@@ -378,9 +382,6 @@ else
 fi
 GRADLE_TASK="${ACTION}${BUILDTYPE}"
 
-if [ "$FORCE_VLC_4" = 1 ]; then
-    gradle_prop="-PforceVlc4=true"
-fi
 if [ -n "$M2_REPO" ]; then
     gradle_prop="$gradle_prop -Dmaven.repo.local=$M2_REPO"
 fi



More information about the Android mailing list