[Android] buildsystem: use a single variable for the main gradle task
Steve Lhomme
git at videolan.org
Mon Jun 16 13:47:41 UTC 2025
vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 12 14:15:49 2025 +0200| [2d015b435ed6d7ea8ccaf7e8cc503a5b92de8fdd] | committer: Duncan McNamara
buildsystem: use a single variable for the main gradle task
And we don't need a variable for the sub tasks.
> https://code.videolan.org/videolan/vlc-android/commit/2d015b435ed6d7ea8ccaf7e8cc503a5b92de8fdd
---
buildsystem/compile.sh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 60b35b4adf..b737bb6a7f 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -373,7 +373,7 @@ if [ "$TEST" = 1 ] || [ "$RUN" = 1 ]; then
else
ACTION="assemble"
fi
-TARGET="${ACTION}${BUILDTYPE}"
+GRADLE_TASK="${ACTION}${BUILDTYPE}"
if [ "$FORCE_VLC_4" = 1 ]; then
gradle_prop="-PforceVlc4=true"
@@ -383,21 +383,19 @@ if [ -n "$M2_REPO" ]; then
fi
if [ "$BUILD_LIBVLC" = 1 ];then
- GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} --project-dir ${VLC_LIBJNI_PATH}/libvlc $TARGET
+ GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} --project-dir ${VLC_LIBJNI_PATH}/libvlc $GRADLE_TASK
RUN=0
elif [ "$BUILD_MEDIALIB" = 1 ]; then
gradle_prop="$gradle_prop -PvlcLibVariant=$GRADLE_ABI"
- ./gradlew ${gradle_prop} --project-dir medialibrary $TARGET
+ ./gradlew ${gradle_prop} --project-dir medialibrary $GRADLE_TASK
RUN=0
else
- ./gradlew ${gradle_prop} $TARGET
+ ./gradlew ${gradle_prop} $GRADLE_TASK
if [ "$BUILDTYPE" = "Release" ] && [ "$ACTION" = "assemble" ]; then
- TARGET="bundle${BUILDTYPE}"
- ./gradlew ${gradle_prop} $TARGET
+ ./gradlew ${gradle_prop} "bundle${BUILDTYPE}"
fi
if [ "$TEST" = 1 ]; then
- TARGET="application:vlc-android:install${BUILDTYPE}AndroidTest"
- ./gradlew ${gradle_prop} $TARGET
+ ./gradlew ${gradle_prop} "application:vlc-android:install${BUILDTYPE}AndroidTest"
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"
More information about the Android
mailing list