summaryrefslogtreecommitdiffstats
path: root/libbacktrace
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-05-20 00:23:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-20 00:23:03 +0000
commitfbc5ca28c965add95bd5751525b09d70b0db76dc (patch)
tree0bd9660ab3bf01e066a7c9ae3529917053d7e6b2 /libbacktrace
parent917152b8cce7a7d7cfd8904b077fd5dca169bc15 (diff)
parentc6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e (diff)
downloadsystem_core-fbc5ca28c965add95bd5751525b09d70b0db76dc.tar.gz
system_core-fbc5ca28c965add95bd5751525b09d70b0db76dc.tar.bz2
system_core-fbc5ca28c965add95bd5751525b09d70b0db76dc.zip
am c6112ca4: am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"
* commit 'c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e': Really fixes the ub branches
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/Android.build.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 76c710640..dc73f9f50 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -60,7 +60,7 @@ LOCAL_LDLIBS := \
$($(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