Fix object logging
Change-Id: I1731637412cf9e894f2b73dc32ab3370f6467160
diff --git a/rsDebugHelper.h b/rsDebugHelper.h
index a70fe4d..f81e258 100644
--- a/rsDebugHelper.h
+++ b/rsDebugHelper.h
@@ -20,42 +20,36 @@
#include "rsUtils.h"
#include "rsInternalDefines.h"
-#ifndef RS_SERVER
-// This shouldn't ever be defined with RS_SERVER
-#define RS_OBJECT_DEBUG 0
-#endif
-
-#if RS_OBJECT_DEBUG
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
#include <utils/CallStack.h>
#endif
namespace android {
namespace renderscript {
-#if RS_OBJECT_DEBUG
class DebugHelper {
public:
DebugHelper() {
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
mStack.update(2);
+#endif
}
void dump() {
- mStack.dump();
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
+ String8 s = mStack.toString();
+ ALOGV("%s", s.string());
+ //mStack.dump();
+#endif
}
private:
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
CallStack mStack;
-};
-
-#else
-
-class DebugHelper {
-public:
- DebugHelper() { }
-};
-
#endif
+};
+
} // namespace renderscript
} // namespace android
