Merge "OS: Use LOG_ALWAYS_FATAL for Android" am: cf34fd95d1 am: 8b6d8a2ad3 (88a43948) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/os/log.h

+15 −12

Original line number	Diff line number	Diff line
		@@ -46,21 +46,24 @@
		#define LOG_INFO(...) LOGWRAPPER(__VA_ARGS__)
		#define LOG_WARN(...) LOGWRAPPER(__VA_ARGS__)
		#define LOG_ERROR(...) LOGWRAPPER(__VA_ARGS__)
		#define LOG_ALWAYS_FATAL(...) \
		do { \
		LOGWRAPPER(__VA_ARGS__); \
		abort(); \
		} while (false)

		#endif /* defined(OS_ANDROID) */

		#define ASSERT(condition) \
		do { \
		if (!(condition)) { \
		LOG_ERROR("%s:%d assertion '" #condition "' failed", __FILE__, __LINE__); \
		abort(); \
		LOG_ALWAYS_FATAL("%s:%d assertion '" #condition "' failed", __FILE__, __LINE__); \
		} \
		} while (false)

		#define ASSERT_LOG(condition, fmt, args...) \
		do { \
		if (!(condition)) { \
		LOG_ERROR("%s:%d assertion '" #condition "' failed - " fmt, __FILE__, __LINE__, ##args); \
		abort(); \
		LOG_ALWAYS_FATAL("%s:%d assertion '" #condition "' failed - " fmt, __FILE__, __LINE__, ##args); \
		} \
		} while (false)