diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 19:53:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:53:02 +0000 |
| commit | 98b8aaf3de1d572cf309e55ef026941db94e52f3 (patch) | |
| tree | c19e01a712ce739c48dfb556b925c92332e4d6b6 /tests | |
| parent | 1707637ed4b5e68496fe3b2e4264c7a5d502ec6b (diff) | |
| parent | 9f4978701783942e836aeab526727458e9cb1492 (diff) | |
| download | hardware_libhardware-98b8aaf3de1d572cf309e55ef026941db94e52f3.zip hardware_libhardware-98b8aaf3de1d572cf309e55ef026941db94e52f3.tar.gz hardware_libhardware-98b8aaf3de1d572cf309e55ef026941db94e52f3.tar.bz2 | |
am 9f497870: Merge "Don\'t manually link stlport."
* commit '9f4978701783942e836aeab526727458e9cb1492':
Don't manually link stlport.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/Android.mk | 8 | ||||
| -rw-r--r-- | tests/keymaster/Android.mk | 13 |
2 files changed, 2 insertions, 19 deletions
diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk index 577ba0a..7eb97c8 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) |