commit 481b551a95d662653e1e6c594ba9617a50f81034
author Christopher Ferris <cferris@google.com> Tue Apr 29 16:01:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 29 16:01:19 2014 +0000
tree 041c3e279eed8d6938a89cf1567bf41cea459472
parent 04acf3475b0eca8c9d86ffb85c6cce86693e2bea
parent 0b0e0eae8cbe3406dfbf14d42eb1229037cc30df

am 0b0e0eae: Merge "Small cleanup of duplicated test values."

* commit '0b0e0eae8cbe3406dfbf14d42eb1229037cc30df':
  Small cleanup of duplicated test values.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index a0ff95f..a7305da 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -96,11 +96,8 @@
 	-fno-builtin \
 	-O0 \
 	-g \
-	-DGTEST_HAS_STD_STRING \
-	-fstack-protector-all \
 
 backtrace_test_cflags_target := \
-	-DGTEST_OS_LINUX_ANDROID \
 	-DENABLE_PSS_TESTS \
 
 backtrace_test_src_files := \