[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH] Use __ANDROID__ consistently to detect Android
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2011-11-03 10:49:27
Message-ID: CAK1hOcOSx2DDwK9vS72qDo67oJaGFvALStnu57Bk0rkXdOBe+g () mail ! gmail ! com
[Download RAW message or body]

On Thu, Nov 3, 2011 at 12:39 AM, Daniel Fandrich <dan@coneharvesters.com> wrote:
> This apparently matches what the standalone Android toolchain
> uses.
> 
> Signed-off-by: Daniel Fandrich <dan@coneharvesters.com>
> ---
> configs/android_defconfig |    2 +-
> include/platform.h        |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/android_defconfig b/configs/android_defconfig
> index 76068b0..1a57d8d 100644
> --- a/configs/android_defconfig
> +++ b/configs/android_defconfig
> @@ -79,7 +79,7 @@ CONFIG_CROSS_COMPILER_PREFIX="arm-eabi-"
> # -fgcse-after-reload
> # -frerun-cse-after-loop
> # -frename-registers
> -CONFIG_EXTRA_CFLAGS="-I$A/system/core/include -I$A/bionic/libc/arch-arm/include \
> -I$A/bionic/libc/include -I$A/bionic/libc/kernel/common \
> -I$A/bionic/libc/kernel/arch-arm -I$A/bionic/libm/include \
> -I$A/bionic/libm/include/arch/arm -include \
> $A/system/core/include/arch/linux-arm/AndroidConfig.h \
> -I$A/system/core/include/arch/linux-arm/ -DANDROID -DSK_RELEASE -nostdlib \
> -march=armv7-a -msoft-float -mfloat-abi=softfp -mfpu=neon -mthumb -mthumb-interwork \
> -fpic -fno-short-enums -fgcse-after-reload -frerun-cse-after-loop \
> -frename-registers" +CONFIG_EXTRA_CFLAGS="-I$A/system/core/include \
> -I$A/bionic/libc/arch-arm/include -I$A/bionic/libc/include \
> -I$A/bionic/libc/kernel/common -I$A/bionic/libc/kernel/arch-arm \
> -I$A/bionic/libm/include -I$A/bionic/libm/include/arch/arm -include \
> $A/system/core/include/arch/linux-arm/AndroidConfig.h \
> -I$A/system/core/include/arch/linux-arm/ -D__ANDROID__ -DSK_RELEASE -nostdlib \
> -march=armv7-a -msoft-float -mfloat-abi=softfp -mfpu=neon -mthumb -mthumb-interwork \
> -fpic -fno-short-enums -fgcse-after-reload -frerun-cse-after-loop \
> -frename-registers"

Applied.

> -#if defined(ANDROID) || defined(__ANDROID__)
> +#if defined(__ANDROID__)
> # undef HAVE_DPRINTF
> # undef HAVE_GETLINE
> # undef HAVE_STPCPY

Let's leave it as is.
-- 
vda
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox


[prev in list] [next in list] [prev in thread] [next in thread]