Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
7159b801
Commit
7159b801
authored
Aug 25, 2014
by
Felix Abecassis
Committed by
Jean-Baptiste Kempf
Aug 26, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LibVlcUtil: fix path of libvlcjni.so when VLC is installed as a system app
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
75374e65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
vlc-android/src/org/videolan/libvlc/LibVlcUtil.java
vlc-android/src/org/videolan/libvlc/LibVlcUtil.java
+8
-1
No files found.
vlc-android/src/org/videolan/libvlc/LibVlcUtil.java
View file @
7159b801
...
...
@@ -31,6 +31,7 @@ import java.nio.ByteOrder;
import
java.util.Locale
;
import
android.content.Context
;
import
android.content.pm.ApplicationInfo
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.util.Log
;
...
...
@@ -99,7 +100,13 @@ public class LibVlcUtil {
// If already checked return cached result
if
(
errorMsg
!=
null
||
isCompatible
)
return
isCompatible
;
ElfData
elf
=
readLib
(
context
.
getApplicationInfo
().
dataDir
+
"/lib/libvlcjni.so"
);
ApplicationInfo
applicationInfo
=
context
.
getApplicationInfo
();
String
libBasePath
;
if
((
applicationInfo
.
flags
&
ApplicationInfo
.
FLAG_SYSTEM
)
!=
0
)
libBasePath
=
"/system"
;
else
libBasePath
=
applicationInfo
.
dataDir
;
ElfData
elf
=
readLib
(
libBasePath
+
"/lib/libvlcjni.so"
);
if
(
elf
==
null
)
{
Log
.
e
(
TAG
,
"WARNING: Unable to read libvlcjni.so; cannot check device ABI!"
);
Log
.
e
(
TAG
,
"WARNING: Cannot guarantee correct ABI for this build (may crash)!"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment