Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3256 from perpe/droid-x86

[Droid x86] Additions for Android x86 architecture
  • Loading branch information...
commit 1755968b34ad145bc572b8e6593eb8d3bcb0a528 2 parents b727bbc + defeb74
Memphiz Memphiz authored
10 configure.in
View
@@ -606,13 +606,19 @@ ffmpeg_target_os=$(tolower $(uname -s))
# host detection and setup
case $host in
- i*86*-android-linux-gnu*)
+ i*86*-linux-android*)
target_platform=target_android
ARCH="i486-linux"
use_arch="x86"
use_cpu="i686"
ffmpeg_target_os=linux
- ;;
+ use_joystick=no
+ use_gles=yes
+ use_optical_drive=no
+ use_sdl=no
+ use_x11=no
+ build_shared_lib=yes
+ ;;
i*86*-linux-gnu*)
ARCH="i486-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
15 docs/README.android
View
@@ -89,20 +89,7 @@ specifies where the resulting toolchain should be installed (your choice).
--toolchain=arm-linux-androideabi-4.7
Make sure to pick a toolchain for your desired architecture. Currently only
-gcc 4.7 toolchains are supported, anything else will likely fail to build.
-
-ATTENTION FOR X86 BUILDS - THIS DOES NOT APPLY TO 99% OF BUILDS:
-If you want to build for the x86 platform there is a flaw in the mentioned
-NDK. See http://code.google.com/p/android/issues/detail?id=19851 which results
-in linker errors mentioning "sigsetjmp and siglongjmp".
-In that case you have to download the libc.tar.bz2 from that google issue
-entry:
-
-http://android.googlecode.com/issues/attachment?aid=198510003000&name=libc.tar.bz2&token=6uNpHc1v8ixmVOTq3y6-ohUfb0o%3A1341156659947
-
-And extract it to <android-toolchain>/android-<x>/sysroot/usr/lib/ and overwrite
-the libc.so there. (where <android-toolchain>/android-<x>/ is the path you have given on the
---install-dir option above)
+gcc 4.7 and gcc 4.8 toolchains are supported, anything else will likely fail to build.
--------------------------------------------------------------------
3.4. Create a (new) debug key to sign debug APKs
2  m4/xbmc_arch.m4
View
@@ -32,7 +32,7 @@ case $host in
arm*-*-linux-gnu*)
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
- arm*-*linux-android*)
+ *-*linux-android*)
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID")
;;
*)
3  tools/android/packaging/Makefile
View
@@ -22,8 +22,9 @@ ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$(
#this fixes a android ndk fuckup where the pathes to
#prebuilt stuff follow different name shemes for
#arm and x86
-ifeq ($(findstring x86,$$(CPU)),x86)
+ifeq ($(findstring i686,$(CPU)),i686)
ARCH=x86
+CPU=x86
endif
ifeq ($(findstring arm,$(CPU)),arm)
ARCH=arm
17 tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java
View
@@ -14,6 +14,7 @@
import java.util.zip.ZipFile;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.app.Activity;
import android.app.ActivityManager;
@@ -261,16 +262,18 @@ public void onCreate(Bundle savedInstanceState) {
}
mState = State.Checking;
-
- boolean ret = ParseCpuFeature();
+ boolean ret = Build.CPU_ABI.equals("x86");
if (!ret) {
- mErrorMsg = "Error! Cannot parse CPU features.";
- mState = State.InError;
- } else {
- ret = CheckCpuFeature("neon");
+ ret = ParseCpuFeature();
if (!ret) {
- mErrorMsg = "This XBMC package is not compatible with your device.\nPlease check the <a href=\"http://wiki.xbmc.org/index.php?title=XBMC_for_Android_specific_FAQ\">XBMC Android wiki</a> for more information.";
+ mErrorMsg = "Error! Cannot parse CPU features.";
mState = State.InError;
+ } else {
+ ret = CheckCpuFeature("neon");
+ if (!ret) {
+ mErrorMsg = "This XBMC package is not compatible with your device.\nPlease check the <a href=\"http://wiki.xbmc.org/index.php?title=XBMC_for_Android_specific_FAQ\">XBMC Android wiki</a> for more information.";
+ mState = State.InError;
+ }
}
}
if (mState != State.InError) {
2  tools/depends/configure.in
View
@@ -102,7 +102,7 @@ case $host in
#android builds are always cross
cross_compiling="yes"
;;
- i*86*-android-linux-gnu*)
+ i*86*-linux-android*)
if test "x$use_cpu" = "xauto"; then
use_cpu=$host_cpu
fi
Please sign in to comment.
Something went wrong with that request. Please try again.