summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-05-29 09:34:13 -0700
committerDan Albert <danalbert@google.com>2014-05-29 10:19:39 -0700
commitdc133729b0bc983c6ecfecdb06ac8b433ea31350 (patch)
tree1d3579fac7cf512173e7f0bc430a2f2aa57aca38
parentbf082ffb71c40e4670410b246309a182d9dafcf5 (diff)
downloadsystem_core-dc133729b0bc983c6ecfecdb06ac8b433ea31350.zip
system_core-dc133729b0bc983c6ecfecdb06ac8b433ea31350.tar.gz
system_core-dc133729b0bc983c6ecfecdb06ac8b433ea31350.tar.bz2
Move libutils to libc++
Bug: 15193147 Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
-rw-r--r--libutils/Android.mk8
-rw-r--r--libutils/tests/Android.mk5
2 files changed, 4 insertions, 9 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk
index 1c48619..923d690 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -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)
diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index caedaff..da51a94 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -18,11 +18,6 @@ shared_libraries := \
liblog \
libcutils \
libutils \
- libstlport
-
-static_libraries := \
- libgtest \
- libgtest_main
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \