Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jeffrow41
VLC-Android
Commits
9099baaa
Commit
9099baaa
authored
3 years ago
by
Hugo Beauzée-Luyssen
Committed by
Nicolas Pomepuy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
compile.sh: Remove support for ANDROID_ABI=all
This is now handled by the CI
parent
9d3c7032
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildsystem/compile.sh
+2
-29
2 additions, 29 deletions
buildsystem/compile.sh
with
2 additions
and
29 deletions
buildsystem/compile.sh
+
2
−
29
View file @
9099baaa
...
...
@@ -145,8 +145,6 @@ elif [ "$ANDROID_ABI" = "x86" ]; then
GRADLE_ABI
=
"x86"
elif
[
"
$ANDROID_ABI
"
=
"x86_64"
]
;
then
GRADLE_ABI
=
"x86_64"
elif
[
"
$ANDROID_ABI
"
=
"all"
]
;
then
GRADLE_ABI
=
"all"
else
diagnostic
"Invalid arch specified: '
$ANDROID_ABI
'."
diagnostic
"Try --help for more information"
...
...
@@ -356,33 +354,8 @@ compile() {
fi
}
if
[
"
$ANDROID_ABI
"
=
"all"
]
;
then
if
[
-d
build/tmp
]
;
then
rm
-rf
build/tmp
fi
mkdir
-p
build/tmp
LIB_DIR
=
"libvlc"
if
[
"
$NO_ML
"
!=
1
]
;
then
LIB_DIR
=
"medialibrary"
fi
copy_tmp
=
"--copy-tmp=
$LIB_DIR
"
# The compile function is sourcing ./compile-libvlc.sh and is configured
# with env variables (ANDROID_ABI), therefore it need to be run from a new
# context for each ABI
(
ANDROID_ABI
=
armeabi-v7a
RELEASE
=
$RELEASE
compile
$copy_tmp
)
(
ANDROID_ABI
=
arm64-v8a
RELEASE
=
$RELEASE
compile
$copy_tmp
)
(
ANDROID_ABI
=
x86
RELEASE
=
$RELEASE
compile
$copy_tmp
)
(
ANDROID_ABI
=
x86_64
RELEASE
=
$RELEASE
compile
$copy_tmp
)
rm
-rf
$LIB_DIR
/jni/libs/
mv
build/tmp
$LIB_DIR
/jni/libs/
GRADLE_VLC_SRC_DIRS
=
"''"
else
compile
GRADLE_VLC_SRC_DIRS
=
"
$VLC_OUT_PATH
/libs"
fi
compile
GRADLE_VLC_SRC_DIRS
=
"
$VLC_OUT_PATH
/libs"
##################
# Compile the UI #
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment