diff options
author | Dan Albert <danalbert@google.com> | 2014-09-08 19:06:54 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-09-11 15:23:50 -0700 |
commit | 0cb2c99f70dec2e4b93b72de9b433f2919c1540e (patch) | |
tree | 05123db873a9d52cd27f75df7809adf06434d425 /camera/tests/Android.mk | |
parent | 032ecb7f233f392e6e68f030bf72a9bc7c861d11 (diff) | |
download | frameworks_av-0cb2c99f70dec2e4b93b72de9b433f2919c1540e.zip frameworks_av-0cb2c99f70dec2e4b93b72de9b433f2919c1540e.tar.gz frameworks_av-0cb2c99f70dec2e4b93b72de9b433f2919c1540e.tar.bz2 |
Clean up test makefiles.
The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.
Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
Diffstat (limited to 'camera/tests/Android.mk')
-rw-r--r-- | camera/tests/Android.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/camera/tests/Android.mk b/camera/tests/Android.mk index ec13911..a806e31 100644 --- a/camera/tests/Android.mk +++ b/camera/tests/Android.mk @@ -1,14 +1,13 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES:= \ - main.cpp \ ProCameraTests.cpp \ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ - libstlport \ libcamera_metadata \ libcamera_client \ libgui \ @@ -17,14 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ libbinder -LOCAL_STATIC_LIBRARIES := \ - libgtest - LOCAL_C_INCLUDES += \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ system/media/camera/include \ frameworks/av/services/camera/libcameraservice \ frameworks/av/include/camera \ |