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
Casanowow Life for love
VLC-Android
Commits
8fe6a66d
Commit
8fe6a66d
authored
Jan 21, 2012
by
Martin Storsjö
Browse files
Build the iomx shared library for ice cream sandwich, too
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
44598fa1
Changes
3
Hide whitespace changes
Inline
Side-by-side
HOWTO
View file @
8fe6a66d
...
...
@@ -76,25 +76,53 @@ cd ../../
# "Stagefright: Memcpy optimization on output port." (available
# upstream at https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=commit;h=052368f194c9fc180b9b0335b60114a2f1fb88d8),
# which adds some vtable entries needed on newer qualcomm devices.
if
[
!
-d
"android-headers/frameworks/base"
]
;
then
echo
"Fetching Android system headers (1/
2
)"
git clone
-b
gingerbread
--depth
=
1 git://github.com/CyanogenMod/android_frameworks_base.git android-headers/frameworks/base
if
[
!
-d
"android-headers
-gingerbread
/frameworks/base"
]
;
then
echo
"Fetching Android system headers (1/
5
)"
git clone
-b
gingerbread
--depth
=
1 git://github.com/CyanogenMod/android_frameworks_base.git android-headers
-gingerbread
/frameworks/base
else
echo
"Updating Android system headers (1/
2
)"
pushd
android-headers/frameworks/base
>
/dev/null
echo
"Updating Android system headers (1/
5
)"
pushd
android-headers
-gingerbread
/frameworks/base
>
/dev/null
git pull origin gingerbread
popd
>
/dev/null
fi
if
[
!
-d
"android-headers/system/core"
]
;
then
echo
"Fetching Android system headers (2/
2
)"
git clone
-b
gingerbread
--depth
=
1 git://github.com/CyanogenMod/android_system_core.git android-headers/system/core
if
[
!
-d
"android-headers
-gingerbread
/system/core"
]
;
then
echo
"Fetching Android system headers (2/
5
)"
git clone
-b
gingerbread
--depth
=
1 git://github.com/CyanogenMod/android_system_core.git android-headers
-gingerbread
/system/core
else
echo
"Updating Android system headers (2/
2
)"
pushd
android-headers/system/core
>
/dev/null
echo
"Updating Android system headers (2/
5
)"
pushd
android-headers
-gingerbread
/system/core
>
/dev/null
git pull origin gingerbread
popd
>
/dev/null
fi
export
ANDROID_SYS_HEADERS
=
${
PWD
}
/android-headers
if
[
!
-d
"android-headers-ics/frameworks/base"
]
;
then
echo
"Fetching Android system headers (3/5)"
git clone
-b
ics
--depth
=
1 git://github.com/CyanogenMod/android_frameworks_base.git android-headers-ics/frameworks/base
else
echo
"Updating Android system headers (3/5)"
pushd
android-headers-ics/frameworks/base
>
/dev/null
git pull origin ics
popd
>
/dev/null
fi
if
[
!
-d
"android-headers-ics/system/core"
]
;
then
echo
"Fetching Android system headers (4/5)"
git clone
-b
ics
--depth
=
1 git://github.com/CyanogenMod/android_system_core.git android-headers-ics/system/core
else
echo
"Updating Android system headers (4/5)"
pushd
android-headers-ics/system/core
>
/dev/null
git pull origin ics
popd
>
/dev/null
fi
if
[
!
-d
"android-headers-ics/hardware/libhardware"
]
;
then
echo
"Fetching Android system headers (5/5)"
git clone
-b
ics
--depth
=
1 git://github.com/CyanogenMod/android_hardware_libhardware.git android-headers-ics/hardware/libhardware
else
echo
"Updating Android system headers (5/5)"
pushd
android-headers-ics/hardware/libhardware
>
/dev/null
git pull origin ics
popd
>
/dev/null
fi
export
ANDROID_SYS_HEADERS_GINGERBREAD
=
${
PWD
}
/android-headers-gingerbread
export
ANDROID_SYS_HEADERS_ICS
=
${
PWD
}
/android-headers-ics
echo
"Fetching Android libraries for linking"
# Libraries from any froyo/gingerbread device/emulator should work
...
...
vlc-android/jni/Android.mk
View file @
8fe6a66d
...
...
@@ -38,9 +38,18 @@ include $(BUILD_SHARED_LIBRARY)
include
$(CLEAR_VARS)
LOCAL_MODULE
:=
libiomx
LOCAL_MODULE
:=
libiomx
-gingerbread
LOCAL_SRC_FILES
:=
../
$(VLC_SRC_DIR)
/modules/codec/omxil/iomx.cpp
LOCAL_C_INCLUDES
:=
$(VLC_SRC_DIR)
/modules/codec/omxil
$(ANDROID_SYS_HEADERS)
/frameworks/base/include
$(ANDROID_SYS_HEADERS)
/system/core/include
LOCAL_C_INCLUDES
:=
$(VLC_SRC_DIR)
/modules/codec/omxil
$(ANDROID_SYS_HEADERS_GINGERBREAD)
/frameworks/base/include
$(ANDROID_SYS_HEADERS_GINGERBREAD)
/system/core/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
LOCAL_LDLIBS
:=
-L
$(ANDROID_LIBS)
-lgcc
-lstagefright
-lmedia
-lutils
-lbinder
include
$(BUILD_SHARED_LIBRARY)
vlc-android/src/org/videolan/vlc/android/LibVLC.java
View file @
8fe6a66d
...
...
@@ -4,6 +4,7 @@ import android.util.Log;
import
android.view.Surface
;
import
android.preference.PreferenceManager
;
import
android.content.SharedPreferences
;
import
android.os.Build
;
public
class
LibVLC
{
private
static
final
String
TAG
=
"VLC/LibVLC"
;
...
...
@@ -30,7 +31,10 @@ public class LibVLC {
/* Load library before object instantiation */
static
{
try
{
System
.
loadLibrary
(
"iomx"
);
if
(
Build
.
VERSION
.
SDK_INT
<=
10
)
System
.
loadLibrary
(
"iomx-gingerbread"
);
else
/* No honeycomb build for now */
System
.
loadLibrary
(
"iomx-ics"
);
}
catch
(
Throwable
t
)
{
Log
.
w
(
TAG
,
"Unable to load the iomx library: "
+
t
);
}
...
...
Write
Preview
Supports
Markdown
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