Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 859830: determine Android API level through android/api-leve.h instead. r=glandium

Browse Source
This commit is contained in:
Vicamo Yang 2013-04-12 13:39:42 +08:00
parent a4e0bb5713
commit f8906b8557
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/autoconf/android.m4
View File

@ -109,6 +109,8 @@ case "$target" in
NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain" NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain"
fi fi
NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-version=$android_version"
if test -z "$android_platform" ; then if test -z "$android_platform" ; then
AC_MSG_CHECKING([for android platform directory]) AC_MSG_CHECKING([for android platform directory])
@ -184,11 +186,8 @@ case "$target" in
ANDROID_NDK="${android_ndk}" ANDROID_NDK="${android_ndk}"
ANDROID_TOOLCHAIN="${android_toolchain}" ANDROID_TOOLCHAIN="${android_toolchain}"
ANDROID_PLATFORM="${android_platform}" ANDROID_PLATFORM="${android_platform}"
ANDROID_VERSION="${android_version}"
AC_DEFINE(ANDROID) AC_DEFINE(ANDROID)
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
AC_SUBST(ANDROID_VERSION)
CROSS_COMPILE=1 CROSS_COMPILE=1
AC_SUBST(ANDROID_NDK) AC_SUBST(ANDROID_NDK)
AC_SUBST(ANDROID_TOOLCHAIN) AC_SUBST(ANDROID_TOOLCHAIN)

2
configure.in
View File

@ -9335,7 +9335,7 @@ if test -n "$_WRAP_MALLOC"; then
fi fi
if test -z "$MOZ_NATIVE_NSPR"; then if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --with-android-version=$ANDROID_VERSION" ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
if test -z "$MOZ_DEBUG"; then if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug" ac_configure_args="$ac_configure_args --disable-debug"
else else

5
js/src/build/autoconf/android.m4
View File

@ -109,6 +109,8 @@ case "$target" in
NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain" NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-toolchain=$android_toolchain"
fi fi
NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-version=$android_version"
if test -z "$android_platform" ; then if test -z "$android_platform" ; then
AC_MSG_CHECKING([for android platform directory]) AC_MSG_CHECKING([for android platform directory])
@ -184,11 +186,8 @@ case "$target" in
ANDROID_NDK="${android_ndk}" ANDROID_NDK="${android_ndk}"
ANDROID_TOOLCHAIN="${android_toolchain}" ANDROID_TOOLCHAIN="${android_toolchain}"
ANDROID_PLATFORM="${android_platform}" ANDROID_PLATFORM="${android_platform}"
ANDROID_VERSION="${android_version}"
AC_DEFINE(ANDROID) AC_DEFINE(ANDROID)
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
AC_SUBST(ANDROID_VERSION)
CROSS_COMPILE=1 CROSS_COMPILE=1
AC_SUBST(ANDROID_NDK) AC_SUBST(ANDROID_NDK)
AC_SUBST(ANDROID_TOOLCHAIN) AC_SUBST(ANDROID_TOOLCHAIN)

7
mozglue/linker/ElfLoader.cpp
View File

@ -14,7 +14,9 @@
#include "Mappable.h" #include "Mappable.h"
#include "Logging.h" #include "Logging.h"
#if defined(ANDROID) && ANDROID_VERSION < 8 #if defined(ANDROID)
#include <android/api-level.h>
#if __ANDROID_API__ < 8
/* Android API < 8 doesn't provide sigaltstack */ /* Android API < 8 doesn't provide sigaltstack */
#include <sys/syscall.h> #include <sys/syscall.h>
@ -25,7 +27,8 @@ inline int sigaltstack(const stack_t *ss, stack_t *oss) {
} }
} /* extern "C" */ } /* extern "C" */
#endif #endif /* __ANDROID_API__ */
#endif /* ANDROID */
using namespace mozilla; using namespace mozilla;

4
tools/profiler/android-signal-defs.h
View File

@ -6,10 +6,12 @@
// Android runs a fairly new Linux kernel, so signal info is there, // Android runs a fairly new Linux kernel, so signal info is there,
// but the C library doesn't have the structs defined. // but the C library doesn't have the structs defined.
#include <android/api-level.h>
// All NDK platform versions have asm/sigcontext.h for ARM // All NDK platform versions have asm/sigcontext.h for ARM
// Only NDK >= 6, platform >= 9 have asm/sigcontext.h for x86 // Only NDK >= 6, platform >= 9 have asm/sigcontext.h for x86
// Only NDK >= 8, platform >= 9 have asm/sigcontext.h for MIPS // Only NDK >= 8, platform >= 9 have asm/sigcontext.h for MIPS
#if defined(__arm__) || defined(__thumb__) || ANDROID_VERSION >= 9 #if defined(__arm__) || defined(__thumb__) || __ANDROID_API__ >= 9
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#else #else
#error use newer NDK or newer platform version (e.g. --with-android-version=9) #error use newer NDK or newer platform version (e.g. --with-android-version=9)