commit 2a0e954ecf7c60e6ec62d64b9382cc4ee447e224
author Dan Albert <danalbert@google.com> Wed May 21 14:55:02 2014 -0700
committer Dan Albert <danalbert@google.com> Wed May 21 19:47:17 2014 -0700
tree 37d22f5d9e221ecd8a68c41d430e7b21fa3f54d1
parent 299d2a2b200a94daa49c4727fd679f4461c083c7

Move art host to libc++

Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 1521caa..296cec9 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -397,12 +397,8 @@
   endif
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
   LOCAL_SHARED_LIBRARIES += liblog libnativehelper
-  ifeq ($$(art_target_or_host),target)
-    include external/libcxx/libcxx.mk
-    LOCAL_SHARED_LIBRARIES += libbacktrace_libc++
-  else
-    LOCAL_SHARED_LIBRARIES += libbacktrace
-  endif
+  include external/libcxx/libcxx.mk
+  LOCAL_SHARED_LIBRARIES += libbacktrace_libc++
   ifeq ($$(art_target_or_host),target)
     LOCAL_SHARED_LIBRARIES += libcutils libdl libselinux libutils
     LOCAL_STATIC_LIBRARIES := libziparchive libz