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

* commit 'c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e':
  Really fixes the ub branches
This commit is contained in:
Dan Albert 2014-05-20 00:23:03 +00:00 committed by Android Git Automerger
commit fbc5ca28c9

View file

@ -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