Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
1cf2e2e9
Commit
1cf2e2e9
authored
May 12, 2012
by
Martin Storsjö
Browse files
Build a version of the iomx plugin for honeycomb
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
340d1f80
Changes
4
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
1cf2e2e9
...
...
@@ -13,6 +13,7 @@ VLC_APK=$(SRC)/bin/VLC-debug.apk
LIBVLCJNI
=
\
$(SRC)
/obj/local/
$(ARCH)
/libvlcjni.so
\
$(SRC)
/obj/local/
$(ARCH)
/libiomx-ics.so
\
$(SRC)
/obj/local/
$(ARCH)
/libiomx-hc.so
\
$(SRC)
/obj/local/
$(ARCH)
/libiomx-gingerbread.so
\
LIBVLCJNI_H
=
$(SRC)
/jni/libvlcjni.h
...
...
compile.sh
View file @
1cf2e2e9
...
...
@@ -125,6 +125,7 @@ echo "Building Android"
cd
../../
export
ANDROID_SYS_HEADERS_GINGERBREAD
=
${
PWD
}
/android-headers-gingerbread
export
ANDROID_SYS_HEADERS_HC
=
${
PWD
}
/android-headers-hc
export
ANDROID_SYS_HEADERS_ICS
=
${
PWD
}
/android-headers-ics
export
ANDROID_LIBS
=
${
PWD
}
/android-libs
...
...
vlc-android/jni/Android.mk
View file @
1cf2e2e9
...
...
@@ -49,6 +49,15 @@ include $(BUILD_SHARED_LIBRARY)
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
libiomx-hc
LOCAL_SRC_FILES
:=
../
$(VLC_SRC_DIR)
/modules/codec/omxil/iomx.cpp
LOCAL_C_INCLUDES
:=
$(VLC_SRC_DIR)
/modules/codec/omxil
$(ANDROID_SYS_HEADERS_HC)
/frameworks/base/include
$(ANDROID_SYS_HEADERS_HC)
/frameworks/base/native/include
$(ANDROID_SYS_HEADERS_HC)
/system/core/include
$(ANDROID_SYS_HEADERS_HC)
/hardware/libhardware/include
LOCAL_LDLIBS
:=
-L
$(ANDROID_LIBS)
-lgcc
-lstagefright
-lmedia
-lutils
-lbinder
include
$(BUILD_SHARED_LIBRARY)
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
libiomx-ics
LOCAL_SRC_FILES
:=
../
$(VLC_SRC_DIR)
/modules/codec/omxil/iomx.cpp
LOCAL_C_INCLUDES
:=
$(VLC_SRC_DIR)
/modules/codec/omxil
$(ANDROID_SYS_HEADERS_ICS)
/frameworks/base/include
$(ANDROID_SYS_HEADERS_ICS)
/frameworks/base/native/include
$(ANDROID_SYS_HEADERS_ICS)
/system/core/include
$(ANDROID_SYS_HEADERS_ICS)
/hardware/libhardware/include
...
...
vlc-android/src/org/videolan/vlc/LibVLC.java
View file @
1cf2e2e9
...
...
@@ -62,7 +62,9 @@ public class LibVLC {
try
{
if
(
Build
.
VERSION
.
SDK_INT
<=
10
)
System
.
loadLibrary
(
"iomx-gingerbread"
);
else
/* No honeycomb build for now */
else
if
(
Build
.
VERSION
.
SDK_INT
<=
13
)
System
.
loadLibrary
(
"iomx-hc"
);
else
System
.
loadLibrary
(
"iomx-ics"
);
}
catch
(
Throwable
t
)
{
Log
.
w
(
TAG
,
"Unable to load the iomx library: "
+
t
);
...
...
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