diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-02 16:31:16 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-10-02 16:31:16 -0700 |
| commit | f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758 (patch) | |
| tree | 4e2b0c2d49c48db5d2ad5a1ddea0734386b2c68c /media/libstagefright/tests/Android.mk | |
| parent | d7bdfd7d33789965988079e3a03ec1233f1f5896 (diff) | |
| parent | 55fc6a77f5c6e26627098dc5257fcf9b605967ef (diff) | |
| download | frameworks_av-f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758.zip frameworks_av-f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758.tar.gz frameworks_av-f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758.tar.bz2 | |
resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aosp
Change-Id: I6bff1d0d214132cbafda081a39016b5b11730865
Diffstat (limited to 'media/libstagefright/tests/Android.mk')
| -rw-r--r-- | media/libstagefright/tests/Android.mk | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk index 724d444..8d6ff5b 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -8,7 +8,7 @@ LOCAL_MODULE := SurfaceMediaSource_test LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ - SurfaceMediaSource_test.cpp \ + SurfaceMediaSource_test.cpp \ DummyRecorder.cpp \ LOCAL_SHARED_LIBRARIES := \ @@ -35,6 +35,33 @@ LOCAL_32_BIT_ONLY := true include $(BUILD_NATIVE_TEST) + +include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +LOCAL_MODULE := Utils_test + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := \ + Utils_test.cpp \ + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + liblog \ + libmedia \ + libstagefright \ + libstagefright_foundation \ + libstagefright_omx \ + +LOCAL_C_INCLUDES := \ + frameworks/av/include \ + frameworks/av/media/libstagefright \ + frameworks/av/media/libstagefright/include \ + $(TOP)/frameworks/native/include/media/openmax \ + +include $(BUILD_NATIVE_TEST) + # Include subdirectory makefiles # ============================================================ |