Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1b307ec authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android (Google) Code Review
Browse files

Merge "Build a static device libutils"

parents 748b696c f19c4ae8
Loading
Loading
Loading
Loading
+20 −5
Original line number Diff line number Diff line
@@ -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_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 := \
        liblog \
        libcutils \
        libdl \
        libcorkscrew \
        libz

LOCAL_MODULE:= libutils
include $(BUILD_SHARED_LIBRARY)

# Include subdirectory makefiles