diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-17 13:46:19 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-17 13:46:43 -0700 |
| commit | ee4e1b1a63758941460ae79a064249d3a5189443 (patch) | |
| tree | d27f03a73170da9cce96b6eae5b2ecd874eace22 /media/libstagefright/tests | |
| parent | 2170233c49e50f3986cdc4f726016d6003cb5b8e (diff) | |
| download | frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.zip frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.gz frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.bz2 | |
stagefright: warnings be gone, some are now errors, use clang
Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
Diffstat (limited to 'media/libstagefright/tests')
| -rw-r--r-- | media/libstagefright/tests/Android.mk | 9 | ||||
| -rw-r--r-- | media/libstagefright/tests/DummyRecorder.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/tests/MediaCodecListOverrides_test.cpp | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk index 51e1c78..532106b 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -31,6 +31,9 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ +LOCAL_CFLAGS += -Werror +LOCAL_CLANG := true + LOCAL_32_BIT_ONLY := true include $(BUILD_NATIVE_TEST) @@ -60,6 +63,9 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ +LOCAL_CFLAGS += -Werror +LOCAL_CLANG := true + include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) @@ -87,6 +93,9 @@ LOCAL_C_INCLUDES := \ LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS += -Werror +LOCAL_CLANG := true + include $(BUILD_NATIVE_TEST) # Include subdirectory makefiles diff --git a/media/libstagefright/tests/DummyRecorder.h b/media/libstagefright/tests/DummyRecorder.h index 1cbea1b..cd4d0ee 100644 --- a/media/libstagefright/tests/DummyRecorder.h +++ b/media/libstagefright/tests/DummyRecorder.h @@ -24,7 +24,7 @@ namespace android { -class MediaSource; +struct MediaSource; class MediaBuffer; class DummyRecorder { diff --git a/media/libstagefright/tests/MediaCodecListOverrides_test.cpp b/media/libstagefright/tests/MediaCodecListOverrides_test.cpp index cacaa84..170cde3 100644 --- a/media/libstagefright/tests/MediaCodecListOverrides_test.cpp +++ b/media/libstagefright/tests/MediaCodecListOverrides_test.cpp @@ -278,7 +278,7 @@ TEST_F(MediaCodecListOverridesTest, exportResultsToExistingFile) { rewind(f); char *buf = (char *)malloc(size); - EXPECT_EQ(1, fread(buf, size, 1, f)); + EXPECT_EQ((size_t)1, fread(buf, size, 1, f)); overrides.setTo(buf, size); fclose(f); free(buf); @@ -303,7 +303,7 @@ TEST_F(MediaCodecListOverridesTest, exportResultsToEmptyFile) { rewind(f); char *buf = (char *)malloc(size); - EXPECT_EQ(1, fread(buf, size, 1, f)); + EXPECT_EQ((size_t)1, fread(buf, size, 1, f)); overrides.setTo(buf, size); fclose(f); free(buf); |