ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Merge "Build a static device libutils"

Browse Source
This commit is contained in:
Bjorn Bringert 2013-04-29 10:10:41 +00:00 committed by Android (Google) Code Review
commit b1b307ec3f
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/utils/Android.mk
View File

@ -98,7 +98,7 @@ LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
# For the device # For the device, static
# ===================================================== # =====================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -123,14 +123,29 @@ LOCAL_C_INCLUDES += \
LOCAL_LDLIBS += -lpthread LOCAL_LDLIBS += -lpthread
LOCAL_STATIC_LIBRARIES := \
libcutils \
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 := \ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libcutils \ libcutils \
libdl \ libdl \
libcorkscrew \ libcorkscrew \
libz libz
LOCAL_MODULE:= libutils
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# Include subdirectory makefiles # Include subdirectory makefiles