traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-29040: Support building Android with Unified Headers (GH-4492)

This commit is contained in:
xdegaye 2017-11-23 11:44:38 +01:00 committed by GitHub
parent 5ad7ef8e42
commit c06c22e9a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/pyport.h
View File

@ -784,7 +784,9 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
#endif /* Py_BUILD_CORE */ #endif /* Py_BUILD_CORE */
#ifdef __ANDROID__ #ifdef __ANDROID__
#include <android/api-level.h> /* The Android langinfo.h header is not used. */
#undef HAVE_LANGINFO_H
#undef CODESET
#endif #endif
/* Maximum value of the Windows DWORD type */ /* Maximum value of the Windows DWORD type */

2
Misc/NEWS.d/next/Build/2017-11-21-16-56-24.bpo-29040.14lCSr.rst Normal file
View File

@ -0,0 +1,2 @@
Support building Android with Unified Headers. The first NDK release to
support Unified Headers is android-ndk-r14.

5
configure vendored
View File

@ -5611,7 +5611,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
$as_echo_n "checking for the Android API level... " >&6; } $as_echo_n "checking for the Android API level... " >&6; }
cat >> conftest.c <<EOF cat >> conftest.c <<EOF
#ifdef __ANDROID__ #ifdef __ANDROID__
#include <android/api-level.h>
android_api = __ANDROID_API__ android_api = __ANDROID_API__
arm_arch = __ARM_ARCH arm_arch = __ARM_ARCH
#else #else
@ -5624,6 +5623,10 @@ if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
_arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out` _arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5
$as_echo "$ANDROID_API_LEVEL" >&6; } $as_echo "$ANDROID_API_LEVEL" >&6; }
if test -z "$ANDROID_API_LEVEL"; then
echo 'Fatal: you must define __ANDROID_API__'
exit 1
fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define ANDROID_API_LEVEL $ANDROID_API_LEVEL #define ANDROID_API_LEVEL $ANDROID_API_LEVEL

5
configure.ac
View File

@ -885,7 +885,6 @@ AC_USE_SYSTEM_EXTENSIONS
AC_MSG_CHECKING([for the Android API level]) AC_MSG_CHECKING([for the Android API level])
cat >> conftest.c <<EOF cat >> conftest.c <<EOF
#ifdef __ANDROID__ #ifdef __ANDROID__
#include <android/api-level.h>
android_api = __ANDROID_API__ android_api = __ANDROID_API__
arm_arch = __ARM_ARCH arm_arch = __ARM_ARCH
#else #else
@ -897,6 +896,10 @@ if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
ANDROID_API_LEVEL=`sed -n -e '/__ANDROID_API__/d' -e 's/^android_api = //p' conftest.out` ANDROID_API_LEVEL=`sed -n -e '/__ANDROID_API__/d' -e 's/^android_api = //p' conftest.out`
_arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out` _arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out`
AC_MSG_RESULT([$ANDROID_API_LEVEL]) AC_MSG_RESULT([$ANDROID_API_LEVEL])
if test -z "$ANDROID_API_LEVEL"; then
echo 'Fatal: you must define __ANDROID_API__'
exit 1
fi
AC_DEFINE_UNQUOTED(ANDROID_API_LEVEL, $ANDROID_API_LEVEL, [The Android API level.]) AC_DEFINE_UNQUOTED(ANDROID_API_LEVEL, $ANDROID_API_LEVEL, [The Android API level.])
AC_MSG_CHECKING([for the Android arm ABI]) AC_MSG_CHECKING([for the Android arm ABI])