commit 7f081ec079923a089c9928bc982154b873addf68
author Christopher Ferris <cferris@google.com> Tue Nov 05 11:38:05 2013 -0800
committer Christopher Ferris <cferris@google.com> Tue Nov 05 12:13:05 2013 -0800
tree 7f88d644b304fb175b47b66617a10d783fb4c144
parent c2945850e58f4ef50f3e3534ce50306262375d37

Use new defines in test code.

In addition, fix up the warnings and remove the -fpermissive when
compiling.

Change-Id: Ia27b902499b34ff3d881acb9057120af390baf2c

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 66d7e62..50354d0 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -137,6 +137,7 @@
 	thread_utils.c \
 
 LOCAL_CFLAGS += \
+	$(common_cflags) \
 	-fno-builtin \
 	-fstack-protector-all \
 	-O0 \
@@ -149,7 +150,6 @@
 
 LOCAL_CPPFLAGS += \
 	$(common_cppflags) \
-	-fpermissive \
 
 LOCAL_SHARED_LIBRARIES += \
 	libcutils \
@@ -241,6 +241,7 @@
 	thread_utils.c \
 
 LOCAL_CFLAGS += \
+	$(common_cflags) \
 	-fno-builtin \
 	-fstack-protector-all \
 	-O0 \
@@ -251,9 +252,6 @@
 	libbacktrace_test \
 	libbacktrace \
 
-LOCAL_CPPFLAGS += \
-	-fpermissive \
-
 LOCAL_LDLIBS := \
 	-lpthread \