commit 2edfa8c9b00cd0c0bd18738f75e0928394b99c76
author Dan Albert <danalbert@google.com> Fri Jan 15 21:02:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 15 21:02:29 2016 +0000
tree 108f5a08a9279b50cebaf694a2da364ee59ecf76
parent f19a33a0704d0e605c0a5206fe5df3ab7dbf6864
parent dbf8c17bd20c3c5b4ba99242afa8b714841914d1

Merge "Make the appropriate cast to protect from mingw."
am: dbf8c17bd2

* commit 'dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
  Make the appropriate cast to protect from mingw.

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index a4e5d3d..1b30d36 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -2107,7 +2107,7 @@
                 indentStr);
     }
 
-    return hasErrors ? UNKNOWN_ERROR : NO_ERROR;
+    return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR;
 }
 
 static status_t writeResourceLoadedCallback(