commit c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e
author Dan Albert <danalbert@google.com> Mon May 19 22:40:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 19 22:40:06 2014 +0000
tree e68e63b727fc6afec532aa7cdeb5dc9b730ca8a3
parent 3f01965b3d1335ffff57e15fd47e5d99400dad3f
parent 5b654f15313f1ad27246269f6e34214ddb798405

am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"

* commit '5b654f15313f1ad27246269f6e34214ddb798405':
  Really fixes the ub branches

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 76c7106..dc73f9f 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -60,7 +60,7 @@
     $($(module)_ldlibs_$(build_type)) \
 
 ifeq ($(build_type),target)
-  ifneq ($(module)_libc++,)
+  ifneq ($($(module)_libc++),)
     include external/libcxx/libcxx.mk
   else
     include external/stlport/libstlport.mk