commit 873dc35b74e83c6b9326d3a90e4c64a612212143
author Christopher Ferris <cferris@google.com> Tue Apr 29 16:09:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 29 16:09:06 2014 +0000
tree 7b56cc904773f455f1d457a8bcadedd3d31258d1
parent a4a5ad73c349adaeb25e9428216c9aae7d74676b
parent c79e511d828cd3dfdd79af40ce5be556a4c2ff9b

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

* commit 'c79e511d828cd3dfdd79af40ce5be556a4c2ff9b':
  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 := \