commit 00c14b4be46bf08cc0a351663e247690f59acfa8
author Bjorn Bringert <bringert@android.com> Fri Mar 22 14:26:33 2013 +0000
committer Alex Ray <aray@google.com> Tue Jul 30 13:57:01 2013 -0700
tree fe057f6595a5a49bb7b23e966c9f70bb3f95219f
parent d34a8cad1efa1c8da1c7b5ad81226b822064cf73

Build a static device libutils

This is needed to make tools such as aapt more compatible when
built for the device.

Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de

libs/utils/Android.mk

diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk
index cbfe7bd..ce25605 100644
--- a/libs/utils/Android.mk
+++ b/libs/utils/Android.mk
@@ -98,7 +98,7 @@
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
-# For the device
+# For the device, static
 # =====================================================
 include $(CLEAR_VARS)
 
@@ -123,14 +123,29 @@
 
 LOCAL_LDLIBS += -lpthread
 
-LOCAL_SHARED_LIBRARIES := \
-	liblog \
+LOCAL_STATIC_LIBRARIES := \
 	libcutils \
-	libdl \
-	libcorkscrew \
 	libz
 
+LOCAL_SHARED_LIBRARIES := \
+        libcorkscrew \
+        liblog \
+        libdl
+
 LOCAL_MODULE:= libutils
+include $(BUILD_STATIC_LIBRARY)
+
+# For the device, shared
+# =====================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libutils
+LOCAL_WHOLE_STATIC_LIBRARIES := libutils
+LOCAL_SHARED_LIBRARIES := \
+        liblog \
+        libcutils \
+        libdl \
+        libcorkscrew \
+        libz
 include $(BUILD_SHARED_LIBRARY)
 
 # Include subdirectory makefiles