diff options
| author | Andreas Huber <andih@google.com> | 2010-06-23 13:20:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 13:20:15 -0700 |
| commit | 03e90f7eeb032c981fc2952aa33f6ba1fae20d97 (patch) | |
| tree | 718e46431587db768675bb1befab6e3b175875c7 | |
| parent | 800af39038dcded12b66eccb8932a761e20b1976 (diff) | |
| parent | 58e9402b12218ca498ea3b932e16819612b1ea87 (diff) | |
| download | frameworks_base-03e90f7eeb032c981fc2952aa33f6ba1fae20d97.zip frameworks_base-03e90f7eeb032c981fc2952aa33f6ba1fae20d97.tar.gz frameworks_base-03e90f7eeb032c981fc2952aa33f6ba1fae20d97.tar.bz2 | |
am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp
* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
| -rw-r--r-- | media/libmedia/MediaScanner.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXMaster.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp index 843a8fd..6f581d3 100644 --- a/media/libmedia/MediaScanner.cpp +++ b/media/libmedia/MediaScanner.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "MediaScanner" +#include <utils/Log.h> + #include <media/mediascanner.h> #include <sys/stat.h> diff --git a/media/libstagefright/omx/OMXMaster.cpp b/media/libstagefright/omx/OMXMaster.cpp index 9a45bea..56b169a 100644 --- a/media/libstagefright/omx/OMXMaster.cpp +++ b/media/libstagefright/omx/OMXMaster.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "OMXMaster" +#include <utils/Log.h> + #include "OMXMaster.h" #include <dlfcn.h> |