From 04d2191800b8fd682c654408c903840a815b611f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 26 Sep 2014 10:55:44 -0700 Subject: Don't manually link stlport. Change-Id: Ib5a6e31b3a6dea39b45727a49356fa2838ea77bc --- tests/camera2/Android.mk | 8 -------- tests/keymaster/Android.mk | 13 ++----------- 2 files changed, 2 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk index 9efac0f..1f2f7a9 100644 --- a/tests/camera2/Android.mk +++ b/tests/camera2/Android.mk @@ -19,7 +19,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libutils \ libcutils \ - libstlport \ libhardware \ libcamera_metadata \ libcameraservice \ @@ -29,14 +28,7 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libdl -LOCAL_STATIC_LIBRARIES := \ - libgtest - LOCAL_C_INCLUDES += \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ system/media/camera/include \ frameworks/av/include/ \ frameworks/av/services/camera/libcameraservice \ 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 @@ include $(CLEAR_VARS) 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) -- cgit v1.1