Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
16
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
Commits
b3316271
Commit
b3316271
authored
8 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
build: libcompat hack only for armv{6|7}
parent
0c81a1d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
compile-libvlc.sh
+8
-2
8 additions, 2 deletions
compile-libvlc.sh
libvlc/jni/Android.mk
+4
-0
4 additions, 0 deletions
libvlc/jni/Android.mk
libvlc/src/org/videolan/libvlc/LibVLC.java
+3
-0
3 additions, 0 deletions
libvlc/src/org/videolan/libvlc/LibVLC.java
with
15 additions
and
2 deletions
compile-libvlc.sh
+
8
−
2
View file @
b3316271
...
...
@@ -653,6 +653,11 @@ fi
echo
"Building NDK"
HAVE_LIBCOMPAT
=
if
[
"
${
ANDROID_API
}
"
=
"android-9"
]
&&
[
"
${
ANDROID_ABI
}
"
=
"armeabi-v7a"
-o
"
${
ANDROID_ABI
}
"
=
"armeabi"
]
;
then
HAVE_LIBCOMPAT
=
1
fi
$ANDROID_NDK
/ndk-build
-C
libvlc
\
VLC_SRC_DIR
=
"
$VLC_SRC_DIR
"
\
ANDROID_SYS_HEADERS
=
"
$ANDROID_SYS_HEADERS
"
\
...
...
@@ -672,11 +677,12 @@ $ANDROID_NDK/ndk-build -C libvlc \
HAVE_64
=
${
HAVE_64
}
\
NDK_PROJECT_PATH
=
jni
\
NDK_TOOLCHAIN_VERSION
=
${
GCCVER
}
\
NDK_DEBUG
=
${
NDK_DEBUG
}
NDK_DEBUG
=
${
NDK_DEBUG
}
\
HAVE_LIBCOMPAT
=
${
HAVE_LIBCOMPAT
}
checkfail
"ndk-build failed"
if
[
"
${
ANDROID_API
}
"
=
"android-9"
]
&&
[
"
${
ANDROID_ABI
}
"
=
"armeabi-v7a"
-o
"
${
ANDROID_ABI
}
"
=
"armeabi"
]
;
then
if
[
"
${
HAVE_LIBCOMPAT
}
"
=
"1"
]
;
then
$ANDROID_NDK
/ndk-build
-C
libvlc
\
APP_BUILD_SCRIPT
=
libcompat/Android.mk
\
APP_PLATFORM
=
${
ANDROID_API
}
\
...
...
This diff is collapsed.
Click to expand it.
libvlc/jni/Android.mk
+
4
−
0
View file @
b3316271
...
...
@@ -46,7 +46,9 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-lmicrodns
\
$(
EXTRA_LDFLAGS
)
ifeq
($(HAVE_LIBCOMPAT), 1)
LOCAL_SHARED_LIBRARIES
:=
libcompat.7
endif
LOCAL_STATIC_LIBRARIES
:=
libdemuxdump2_plugin
include
$(BUILD_SHARED_LIBRARY)
...
...
@@ -85,9 +87,11 @@ include $(BUILD_SHARED_LIBRARY)
# DUMMY COMPAT LIB #
####################
ifeq
($(HAVE_LIBCOMPAT), 1)
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
libcompat.7
include
$(BUILD_SHARED_LIBRARY)
endif
################
# PRIVATE LIBS #
...
...
This diff is collapsed.
Click to expand it.
libvlc/src/org/videolan/libvlc/LibVLC.java
+
3
−
0
View file @
b3316271
...
...
@@ -188,6 +188,9 @@ public class LibVLC extends VLCObject<LibVLC.Event> {
try
{
System
.
loadLibrary
(
"compat.7"
);
}
catch
(
Throwable
ignored
)
{}
try
{
System
.
loadLibrary
(
"vlc"
);
System
.
loadLibrary
(
"vlcjni"
);
}
catch
(
UnsatisfiedLinkError
ule
)
{
...
...
This diff is collapsed.
Click to expand it.
Thomas Guillem
@tguillem
mentioned in commit
dea97f14
·
8 years ago
mentioned in commit
dea97f14
mentioned in commit dea97f14c2ba21369d717b6c90f828a7ff84d193
Toggle commit list
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