Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
534
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Merge requests
!1771
Buildsystem: fix ml build after vlc move
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Buildsystem: fix ml build after vlc move
Skantes/vlc-android:fix-ml
into
master
Overview
1
Commits
1
Pipelines
1
Changes
1
Closed
Duncan McNamara
requested to merge
Skantes/vlc-android:fix-ml
into
master
1 year ago
Overview
1
Commits
1
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
8510432c
1 commit,
1 year ago
1 file
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
buildsystem/compile-medialibrary.sh
+
3
−
3
Options
@@ -143,15 +143,15 @@ if [ "$RELEASE" = "1" ]; then
fi
if
[
!
-d
"build-android-
$ANDROID_ABI
/"
-o
!
-f
"build-android-
$ANDROID_ABI
/build.ninja"
]
;
then
PKG_CONFIG_LIBDIR
=
"
$SRC_DIR
/vlc/build-android-
${
TARGET_TUPLE
}
/install/lib/pkgconfig"
\
PKG_CONFIG_PATH
=
"
$SRC_DIR
/medialibrary/prefix/
${
TARGET_TUPLE
}
/lib/pkgconfig:
$SRC_DIR
/vlc/contrib/
$TARGET_TUPLE
/lib/pkgconfig/"
\
PKG_CONFIG_LIBDIR
=
"
$
LIBVLCJNI_
SRC_DIR
/vlc/build-android-
${
TARGET_TUPLE
}
/install/lib/pkgconfig"
\
PKG_CONFIG_PATH
=
"
$SRC_DIR
/medialibrary/prefix/
${
TARGET_TUPLE
}
/lib/pkgconfig:
$
LIBVLCJNI_
SRC_DIR
/vlc/contrib/
$TARGET_TUPLE
/lib/pkgconfig/"
\
meson
\
-Ddebug
=
true
\
-Doptimization
=
${
MEDIALIBRARY_OPTIMIZATION
}
\
-Db_ndebug
=
${
MEDIALIBRARY_NDEBUG
}
\
-Ddefault_library
=
static
\
--cross-file
${
SRC_DIR
}
/buildsystem/crossfiles/
${
ANDROID_ABI
}
-ndk
${
REL
}
.crossfile
\
-Dlibjpeg_prefix
=
"
$SRC_DIR
/vlc/contrib/
$TARGET_TUPLE
/"
\
-Dlibjpeg_prefix
=
"
$
LIBVLCJNI_
SRC_DIR
/vlc/contrib/
$TARGET_TUPLE
/"
\
-Dtests
=
disabled
\
-Dforce_attachment_api
=
true
\
build-android-
${
ANDROID_ABI
}
Loading