Merge "Add some extra debug information because this error is only happening on the build server." into ics-aah
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index e5689b9..cd23b65 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -424,8 +424,9 @@
     } else {
         if (!(kind == INTERFACE_TYPE_BINDER ? returnType->CanWriteToParcel()
                     : returnType->CanWriteToRpcData())) {
-            fprintf(stderr, "%s:%d return type %s can't be marshalled.\n", filename,
-                        m->type.type.lineno, m->type.type.data);
+            fprintf(stderr, "%s:%d return type %s can't be marshalled. kind=%d p=%d m=%d\n", filename,
+                        m->type.type.lineno, m->type.type.data, kind,
+                        returnType->CanWriteToParcel(), returnType->CanWriteToRpcData());
             err = 1;
         }
     }