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

Commit 9f69e028 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Move libutils to libc++"

parents 5f815da3 dc133729

libutils/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \ 
	libcutils



LOCAL_SHARED_LIBRARIES := \

        libbacktrace \

        libbacktrace_libc++ \

        liblog \

        libdl



include external/stlport/libstlport.mk

include external/libcxx/libcxx.mk



LOCAL_MODULE:= libutils

include $(BUILD_STATIC_LIBRARY)
@@ -123,12 +123,12 @@ include $(CLEAR_VARS) 
LOCAL_MODULE:= libutils

LOCAL_WHOLE_STATIC_LIBRARIES := libutils

LOCAL_SHARED_LIBRARIES := \

        libbacktrace \

        libbacktrace_libc++ \

        libcutils \

        libdl \

        liblog \



include external/stlport/libstlport.mk

include external/libcxx/libcxx.mk



include $(BUILD_SHARED_LIBRARY)

libutils/tests/Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ shared_libraries := \ 
    liblog \

    libcutils \

    libutils \

    libstlport



static_libraries := \

    libgtest \

    libgtest_main



$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \