openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Move libutils to libc++""

This commit is contained in:
Dan Albert 2014-05-30 20:13:48 +00:00 committed by Gerrit Code Review
parent 9f69e028f7 7bc49a16e8
commit 570cd46d14
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libutils/Android.mk
View File

@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \
libcutils
LOCAL_SHARED_LIBRARIES := \
libbacktrace_libc++ \
libbacktrace \
liblog \
libdl
include external/libcxx/libcxx.mk
include external/stlport/libstlport.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_libc++ \
libbacktrace \
libcutils \
libdl \
liblog \
include external/libcxx/libcxx.mk
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)

5
libutils/tests/Android.mk
View File

@ -18,6 +18,11 @@ shared_libraries := \
liblog \
libcutils \
libutils \
libstlport
static_libraries := \
libgtest \
libgtest_main
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \