From a7c2e0bad678280b9d76eacdb50b1361ab0849ff Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 14 Oct 2014 14:19:34 -0700
Subject: [PATCH] We don't actually need all of libc++ here.

All we're actually interested in is the unwinder. Since that's now a
separate library, just use that.

Change-Id: If86071a0d850da961336a58147b70369ace7bd12
---
 libc/Android.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libc/Android.mk b/libc/Android.mk
index 078e8c3ae..e25b22d35 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1161,14 +1161,11 @@ LOCAL_CLANG := $(use_clang)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
 
 LOCAL_SHARED_LIBRARIES := libc libdl
-ifeq ($(TARGET_ARCH),arm)
+LOCAL_CXX_STL := none
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
 # Only need this for arm since libc++ uses its own unwind code that
 # doesn't mix with the other default unwind code.
-LOCAL_CXX_STL := libc++_static
-else
-LOCAL_CXX_STL := none
-endif
-LOCAL_SYSTEM_SHARED_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 
 # Don't install on release build