public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: devon.davies@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: Devon Davies <devon.davies@intel.com>
Subject: [PATCH] build: Added -UNDEBUG to tools/Android.mk
Date: Wed,  8 Jan 2014 16:07:06 +0000	[thread overview]
Message-ID: <1389197226-6928-1-git-send-email-devon.davies@intel.com> (raw)

From: Devon Davies <devon.davies@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@intel.com>
---
 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.

             reply	other threads:[~2014-01-08 16:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-08 16:07 devon.davies [this message]
2014-01-08 16:27 ` [PATCH] build: Added -UNDEBUG to tools/Android.mk Damien Lespiau
2014-01-08 17:13 ` Mateo Lozano, Oscar
2014-01-08 17:20   ` Damien Lespiau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389197226-6928-1-git-send-email-devon.davies@intel.com \
    --to=devon.davies@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox