commit 04d2191800b8fd682c654408c903840a815b611f
author Dan Albert <danalbert@google.com> Fri Sep 26 10:55:44 2014 -0700
committer Dan Albert <danalbert@google.com> Fri Sep 26 10:55:44 2014 -0700
tree 1800188aecaa638647eb69df79cfabd746c8c58a
parent 3e618a6aa10c783d1536f20edfc3347939cfa18e

Don't manually link stlport.

Change-Id: Ib5a6e31b3a6dea39b45727a49356fa2838ea77bc

tests/keymaster/Android.mk

diff --git a/tests/keymaster/Android.mk b/tests/keymaster/Android.mk
index e53e67f..c420db9 100644
--- a/tests/keymaster/Android.mk
+++ b/tests/keymaster/Android.mk
@@ -6,26 +6,17 @@
 LOCAL_SRC_FILES:= \
     keymaster_test.cpp
 
-# Note that "bionic" is needed because of stlport
 LOCAL_C_INCLUDES := \
-    bionic \
-    external/gtest/include \
     external/openssl/include \
-    external/stlport/stlport
 
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libutils \
     libcrypto \
-    libstlport \
-    libhardware
-
-LOCAL_STATIC_LIBRARIES := \
-    libgtest \
-    libgtest_main
+    libhardware \
 
 LOCAL_MODULE := keymaster_test
 
 LOCAL_MODULE_TAGS := tests
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)