commit fbc5ca28c965add95bd5751525b09d70b0db76dc
author Dan Albert <danalbert@google.com> Tue May 20 00:23:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 20 00:23:03 2014 +0000
tree 0bd9660ab3bf01e066a7c9ae3529917053d7e6b2
parent 917152b8cce7a7d7cfd8904b077fd5dca169bc15
parent c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e

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

* commit 'c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e':
  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