commit 7bc49a16e80bd6306fc467e27c019aa72b9a2701
author Dan Albert <danalbert@google.com> Fri May 30 19:40:58 2014 +0000
committer Dan Albert <danalbert@google.com> Fri May 30 19:40:58 2014 +0000
tree 49a8bcc39396bd60ceec62735c02c7a82eccbaf6
parent dc133729b0bc983c6ecfecdb06ac8b433ea31350

Revert "Move libutils to libc++"

Causes issues in the unbundled branches.

This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a

libutils/tests/Android.mk

diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index da51a94..caedaff 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -18,6 +18,11 @@
     liblog \
     libcutils \
     libutils \
+    libstlport
+
+static_libraries := \
+    libgtest \
+    libgtest_main
 
 $(foreach file,$(test_src_files), \
     $(eval include $(CLEAR_VARS)) \