diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 05:59:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 05:59:26 +0000 |
| commit | bd014b81ef227752150bdbd1bb6a235db09f3616 (patch) | |
| tree | 0a63f29eb4c20eab0df0a02f17ed51e7c0570c08 /media | |
| parent | e21b7cd8feb7e9468c932609c53a114b1680a012 (diff) | |
| parent | fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf (diff) | |
| download | frameworks_av-bd014b81ef227752150bdbd1bb6a235db09f3616.zip frameworks_av-bd014b81ef227752150bdbd1bb6a235db09f3616.tar.gz frameworks_av-bd014b81ef227752150bdbd1bb6a235db09f3616.tar.bz2 | |
am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."
* commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf':
Clean up test makefiles.
Diffstat (limited to 'media')
| -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 # ============================================================ |