diff options
| author | Bjorn Bringert <bringert@android.com> | 2013-03-22 14:26:33 +0000 |
|---|---|---|
| committer | Alex Ray <aray@google.com> | 2013-07-30 13:57:01 -0700 |
| commit | 00c14b4be46bf08cc0a351663e247690f59acfa8 (patch) | |
| tree | fe057f6595a5a49bb7b23e966c9f70bb3f95219f /libs | |
| parent | d34a8cad1efa1c8da1c7b5ad81226b822064cf73 (diff) | |
| download | system_core-00c14b4be46bf08cc0a351663e247690f59acfa8.zip system_core-00c14b4be46bf08cc0a351663e247690f59acfa8.tar.gz system_core-00c14b4be46bf08cc0a351663e247690f59acfa8.tar.bz2 | |
Build a static device libutils
This is needed to make tools such as aapt more compatible when
built for the device.
Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/Android.mk | 25 |
1 files changed, 20 insertions, 5 deletions
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 @@ LOCAL_LDLIBS += $(host_commonLdlibs) include $(BUILD_HOST_STATIC_LIBRARY) -# For the device +# For the device, static # ===================================================== include $(CLEAR_VARS) @@ -123,14 +123,29 @@ LOCAL_C_INCLUDES += \ 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 |