Browse Source

buildsystem: pass the library/apk ABI variant name as a property to medialibrary

It's lowercase "all" by default.

It's only set to a specialized value when building libvlc and medialib libraries.
merge-requests/2255/merge
Steve Lhomme 10 months ago
committed by Duncan McNamara
parent
commit
ab47930381
  1. 3
      buildsystem/compile.sh
  2. 4
      buildsystem/gitlab/.gitlab-ci.yml
  3. 2
      medialibrary/build.gradle

3
buildsystem/compile.sh

@ -380,7 +380,8 @@ if [ "$BUILD_LIBVLC" = 1 ];then
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} -p medialibrary assemble${BUILDTYPE}
gradle_prop="$gradle_prop -PvlcLibVariant=$GRADLE_ABI"
./gradlew ${gradle_prop} -p medialibrary assemble${BUILDTYPE}
RUN=0
else
if [ "$TEST" = 1 ] || [ "$RUN" = 1 ]; then

4
buildsystem/gitlab/.gitlab-ci.yml

@ -448,7 +448,7 @@ publish_libs:
- git config --global --add safe.directory $CI_PROJECT_DIR/libvlcjni
- ./buildsystem/compile.sh --init -b
- GRADLE_ABI=ALL ./gradlew -Dmaven.repo.local=$M2_REPO -p libvlcjni publishToMavenLocal
- GRADLE_ABI=ALL ./gradlew -Dmaven.repo.local=$M2_REPO -p medialibrary publishToMavenLocal
- ./gradlew -Dmaven.repo.local=$M2_REPO -p medialibrary publishToMavenLocal
artifacts:
name: "${CI_COMMIT_TAG}.dbg"
paths:
@ -486,7 +486,7 @@ publish_libs-v4:
- git config --global --add safe.directory $CI_PROJECT_DIR/libvlcjni
- ./buildsystem/compile.sh --init -b -vlc4
- GRADLE_ABI=ALL ./gradlew -Dmaven.repo.local=$M2_REPO -PforceVlc4=true -p libvlcjni publishToMavenLocal
- GRADLE_ABI=ALL ./gradlew -Dmaven.repo.local=$M2_REPO -PforceVlc4=true -p medialibrary publishToMavenLocal
- ./gradlew -Dmaven.repo.local=$M2_REPO -PforceVlc4=true -p medialibrary publishToMavenLocal
artifacts:
name: "${CI_COMMIT_TAG}.dbg"
paths:

2
medialibrary/build.gradle

@ -23,7 +23,7 @@
apply plugin: 'com.android.library'
apply plugin: "com.vanniktech.maven.publish"
def abi = System.getenv('GRADLE_ABI')?.toLowerCase()
def abi = project.hasProperty('vlcLibVariant') ? project.getProperty('vlcLibVariant') : 'all'
ext {
library_version = "$rootProject.ext.medialibraryVersion"
}

Loading…
Cancel
Save