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 /media/libstagefright/tests | |
| 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 'media/libstagefright/tests')
| -rw-r--r-- | media/libstagefright/tests/Android.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk index 903af49..724d444 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -1,8 +1,7 @@ # Build the unit tests. LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) - -ifneq ($(TARGET_SIMULATOR),true) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := SurfaceMediaSource_test @@ -22,30 +21,19 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright \ libstagefright_foundation \ libstagefright_omx \ - libstlport \ libsync \ libui \ libutils \ liblog -LOCAL_STATIC_LIBRARIES := \ - libgtest \ - libgtest_main \ - LOCAL_C_INCLUDES := \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ frameworks/av/media/libstagefright \ frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ LOCAL_32_BIT_ONLY := true -include $(BUILD_EXECUTABLE) - -endif +include $(BUILD_NATIVE_TEST) # Include subdirectory makefiles # ============================================================ |