commit e8bb8dfaf5c91de50c9336e141af0acf8bf2987a
author Dan Albert <danalbert@google.com> Thu May 07 13:42:56 2015 -0700
committer Dan Albert <danalbert@google.com> Fri May 08 00:00:41 2015 +0000
tree 2d8c9eff78caaea47009def6fb812b7d8e43362c
parent 97ca3dba1b7c7fc5f35961ff6e6a14ef3843aa86

Stop using stlport.

Bug: http://b/15193147
Change-Id: Ie58c5a85b5510fd02899e4b0e003b8b248192b65
(cherry picked from commit 65fa7189d02eedb7d882bbf5190ca7b92163ee49)

merrifield/test/Android.mk

diff --git a/merrifield/test/Android.mk b/merrifield/test/Android.mk
index b0a262e..0c9fe4a 100644
--- a/merrifield/test/Android.mk
+++ b/merrifield/test/Android.mk
@@ -15,18 +15,12 @@
 	libbinder \
 	libcutils \
 	libgui \
-	libstlport \
 	libui \
 	libutils \
 
 LOCAL_C_INCLUDES := \
-    bionic \
-    $(call include-path-for, libstdc++) \
     $(call include-path-for, gtest) \
-    $(call include-path-for, stlport)
 
 # Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
 # to integrate with auto-test framework.
 include $(BUILD_EXECUTABLE)
-
-