diff options
| author | James Dong <jdong@google.com> | 2012-02-06 23:46:37 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-10 11:43:09 -0800 |
| commit | f1d5aa162c02a16b7195a43a9bcea4d592600ac4 (patch) | |
| tree | dc270a6e1a4ee6695e309eeb29c4d9ed7f3a20a2 /media/libstagefright/id3 | |
| parent | 43089daaf82bd2b8e5f9a29b80af5abaae4657b3 (diff) | |
| download | frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.zip frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.gz frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.bz2 | |
Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
Diffstat (limited to 'media/libstagefright/id3')
| -rw-r--r-- | media/libstagefright/id3/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/id3/testid3.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/id3/Android.mk b/media/libstagefright/id3/Android.mk index 23c8e44..ff35d4a 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \ testid3.cpp LOCAL_SHARED_LIBRARIES := \ - libstagefright libutils libbinder + libstagefright libutils libbinder libstagefright_foundation LOCAL_STATIC_LIBRARIES := \ libstagefright_id3 diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 6dde9d8..2e92926 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -20,8 +20,8 @@ #include "../include/ID3.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/DataSource.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/Utils.h> #include <utils/String8.h> #include <byteswap.h> diff --git a/media/libstagefright/id3/testid3.cpp b/media/libstagefright/id3/testid3.cpp index 0741045..bc4572c 100644 --- a/media/libstagefright/id3/testid3.cpp +++ b/media/libstagefright/id3/testid3.cpp @@ -23,7 +23,7 @@ #include <binder/ProcessState.h> #include <media/stagefright/FileSource.h> -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #define MAXPATHLEN 256 @@ -70,7 +70,7 @@ static void hexdump(const void *_data, size_t size) { void scanFile(const char *path) { sp<FileSource> file = new FileSource(path); - CHECK_EQ(file->initCheck(), OK); + CHECK_EQ(file->initCheck(), (status_t)OK); ID3 tag(file); if (!tag.isValid()) { |