Add __android_log_assert.

third_party/hwcplus/src/hwcplus_util.c

Index: third_party/hwcplus/src/hwcplus_util.c
diff --git a/third_party/hwcplus/src/hwcplus_util.c b/third_party/hwcplus/src/hwcplus_util.c
index 57c4519c8790370db400a6e5cee03295b60d156c..983a87643f37bc8242d7cb6810c5f6d95dbac033 100644
--- a/third_party/hwcplus/src/hwcplus_util.c
+++ b/third_party/hwcplus/src/hwcplus_util.c
@@ -6,8 +6,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <hardware/hardware.h>
+#include <android/log.h>

[rjkroege, 2014/06/11 16:02:45]

this wouldn't compile on CrOS right? The includes would be missing.  How will
this work?

[fjhenigman, 2014/06/11 17:43:04]

This is src/third_party/hwcplus/include/android/log.h which gets installed to
/usr/include/hwcplus/android/log.h by the hwcplus chromeos package.
It works.

 #include <cutils/properties.h>
+#include <hardware/hardware.h>
 
 #define LOG_BUF_SIZE 1024
 
@@ -64,6 +65,31 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...) {
     return __android_log_write(prio, tag, buf);
 }
 
+void __android_log_assert(const char* cond, const char* tag, const char* fmt,

[rjkroege, 2014/06/11 16:02:45]

can you line-break per chromium style

[fjhenigman, 2014/06/11 17:43:04]

I made the second line start after the open paren of the first line.
Hope that's right.  Couldn't find it in any style guide.

+        ...) {
+    char buf[LOG_BUF_SIZE];
+
+    if (fmt) {
+        va_list ap;
+        va_start(ap, fmt);
+        vsnprintf(buf, LOG_BUF_SIZE, fmt, ap);
+        va_end(ap);
+    } else {
+        /* Msg not provided, log condition.  N.B. Do not use cond directly as
+         * format string as it could contain spurious '%' syntax (e.g.
+         * "%d" in "blocks%devs == 0").
+         */
+        if (cond)
+            snprintf(buf, LOG_BUF_SIZE, "Assertion failed: %s", cond);
+        else
+            snprintf(buf, LOG_BUF_SIZE, "Unspecified assertion failed");
+    }
+
+    __android_log_write(ANDROID_LOG_FATAL, tag, buf);
+
+    __builtin_trap(); /* trap so we have a chance to debug the situation */
+}
+
 int property_get(const char* key, char* value, const char* default_value) {
     printf("property_get %s\n", key);
     const char* r = default_value;
@@ -72,4 +98,3 @@ int property_get(const char* key, char* value, const char* default_value) {
     strncpy(value, r, PROPERTY_VALUE_MAX);
     return strlen(r);
 }
-