diff options
| author | Glenn Kasten <gkasten@google.com> | 2010-10-13 09:54:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-13 09:54:43 -0700 |
| commit | 80b645911cfc4ddbd8c011efe55c502cd03c7908 (patch) | |
| tree | ccd43c486c5c9a6a59890588e5e626b05f37bae7 | |
| parent | 98a1f3f49f963eb6608771993edc69b2b0d549fa (diff) | |
| parent | 5c2e518c71082e42e739db3bed478a881a1675fa (diff) | |
| download | android_system_media-80b645911cfc4ddbd8c011efe55c502cd03c7908.tar.gz android_system_media-80b645911cfc4ddbd8c011efe55c502cd03c7908.tar.bz2 android_system_media-80b645911cfc4ddbd8c011efe55c502cd03c7908.zip | |
Merge "Make log less noisy" into gingerbread
| -rw-r--r-- | opensles/libopensles/Android.mk | 5 | ||||
| -rw-r--r-- | opensles/libopensles/sllog.h | 22 |
2 files changed, 13 insertions, 14 deletions
diff --git a/opensles/libopensles/Android.mk b/opensles/libopensles/Android.mk index 009bac5d..96d5f5f4 100644 --- a/opensles/libopensles/Android.mk +++ b/opensles/libopensles/Android.mk @@ -28,8 +28,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CFLAGS += -DUSE_PROFILES=0 -DUSE_TRACE -DUSE_DEBUG -UNDEBUG \ --DUSE_LOG=SLAndroidLogLevel_Verbose +LOCAL_CFLAGS += -DUSE_PROFILES=0 -UUSE_TRACE -UUSE_DEBUG -DNDEBUG -DUSE_LOG=SLAndroidLogLevel_Info +#LOCAL_CFLAGS += -DUSE_PROFILES=0 -DUSE_TRACE -DUSE_DEBUG -UNDEBUG \ +# -DUSE_LOG=SLAndroidLogLevel_Verbose #LOCAL_CFLAGS += -DSL_TRACE_DEFAULT=SL_TRACE_ALL # Reduce size of .so and hide internal global symbols diff --git a/opensles/libopensles/sllog.h b/opensles/libopensles/sllog.h index ccf1ec83..92e2f481 100644 --- a/opensles/libopensles/sllog.h +++ b/opensles/libopensles/sllog.h @@ -25,18 +25,16 @@ // V(erbose) // Debug and verbose are usually compiled out except during development. -/** These values match the definitions in core/include/cutils/log.h */ -typedef enum { - SLAndroidLogLevel_Unknown = 0, - SLAndroidLogLevel_Default = 1, - SLAndroidLogLevel_Verbose = 2, - SLAndroidLogLevel_Debug = 3, - SLAndroidLogLevel_Info = 4, - SLAndroidLogLevel_Warn = 5, - SLAndroidLogLevel_Error = 6, - SLAndroidLogLevel_Fatal = 7, - SLAndroidLogLevel_Silent = 8 -} SLAndroidLogLevel; +/** These values match the definitions in system/core/include/cutils/log.h */ +#define SLAndroidLogLevel_Unknown 0 +#define SLAndroidLogLevel_Default 1 +#define SLAndroidLogLevel_Verbose 2 +#define SLAndroidLogLevel_Debug 3 +#define SLAndroidLogLevel_Info 4 +#define SLAndroidLogLevel_Warn 5 +#define SLAndroidLogLevel_Error 6 +#define SLAndroidLogLevel_Fatal 7 +#define SLAndroidLogLevel_Silent 8 // USE_LOG is the minimum log priority level that is enabled at build time. // It is configured in Android.mk but can be overridden per source file. |