commit 85622165c95fde358c3abf3139c27a203f298b2f
author Brian Carlstrom <bdc@google.com> Thu Jan 15 23:52:37 2015 -0800
committer Brian Carlstrom <bdc@google.com> Thu Jan 15 23:52:37 2015 -0800
tree bd0d210d56217ceb5b222bc56ef3f96bcb6b19cc
parent 2c3f08c49eed3d8d3218a3189708f2696dfc2ce6

Add support for non-XLOG logging macros

Change-Id: Ie520e5ae119e72637f699a4f97a9e02413210972

jni/fmr/fmr.h

diff --git a/jni/fmr/fmr.h b/jni/fmr/fmr.h
index b666b8f..a5803fb 100644
--- a/jni/fmr/fmr.h
+++ b/jni/fmr/fmr.h
@@ -34,7 +34,7 @@
 
 #include "fm.h"
 
-#define FM_LIB_USE_XLOG
+#undef FM_LIB_USE_XLOG
 
 #ifdef FM_LIB_USE_XLOG
 #include <cutils/xlog.h>
@@ -48,6 +48,17 @@
 #define LOGW(...) XLOGW(__VA_ARGS__)
 #undef LOGE
 #define LOGE(...) XLOGE(__VA_ARGS__)
+#else
+#undef LOGV
+#define LOGV(...) ALOGV(__VA_ARGS__)
+#undef LOGD
+#define LOGD(...) ALOGD(__VA_ARGS__)
+#undef LOGI
+#define LOGI(...) ALOGI(__VA_ARGS__)
+#undef LOGW
+#define LOGW(...) ALOGW(__VA_ARGS__)
+#undef LOGE
+#define LOGE(...) ALOGE(__VA_ARGS__)
 #endif
 
 #define CUST_LIB_NAME "libfmcust.so"