[Intel-gfx] [PATCH] build: Added -UNDEBUG to tools/Android.mk

Damien Lespiau damien.lespiau at intel.com
Wed Jan 8 17:27:09 CET 2014


On Wed, Jan 08, 2014 at 04:07:06PM +0000, devon.davies at intel.com wrote:
> From: Devon Davies <devon.davies at intel.com>
> 
> NDEBUG is defined by default in Android and causes assert(x) to be
> defined as void(x). This change ensures that asserts work as
> expected in tools.
> 
> This flag is already inside tests/Android.mk
> 
> Signed-off-by: Devon Davies <devon.davies at intel.com>

Hi Oscar,

The change looks good from here, mind dropping a Reviewed-By tag as you
were the one looking at that in the first place?

Thanks,

-- 
Damien

> ---
>  tools/Android.mk |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/Android.mk b/tools/Android.mk
> index 4a19b6c..5bda489 100644
> --- a/tools/Android.mk
> +++ b/tools/Android.mk
> @@ -40,7 +40,7 @@ define add_tool
>  
>      LOCAL_CFLAGS += -DHAVE_TERMIOS_H
>      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
> -    LOCAL_CFLAGS += -DANDROID
> +    LOCAL_CFLAGS += -DANDROID -UNDEBUG
>      LOCAL_CFLAGS += -std=c99
>      # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
>      LOCAL_CFLAGS += -Wno-error=return-type
> -- 
> 1.7.9.5
> 
> ---------------------------------------------------------------------
> Intel Corporation (UK) Limited
> Registered No. 1134945 (England)
> Registered Office: Pipers Way, Swindon SN3 1RJ
> VAT No: 860 2173 47
> 
> This e-mail and any attachments may contain confidential material for
> the sole use of the intended recipient(s). Any review or distribution
> by others is strictly prohibited. If you are not the intended
> recipient, please contact the sender and delete all copies.
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



More information about the Intel-gfx mailing list