diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-15 21:02:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 21:02:29 +0000 |
| commit | 2edfa8c9b00cd0c0bd18738f75e0928394b99c76 (patch) | |
| tree | 108f5a08a9279b50cebaf694a2da364ee59ecf76 /tools/aapt/Resource.cpp | |
| parent | f19a33a0704d0e605c0a5206fe5df3ab7dbf6864 (diff) | |
| parent | dbf8c17bd20c3c5b4ba99242afa8b714841914d1 (diff) | |
Merge "Make the appropriate cast to protect from mingw."
am: dbf8c17bd2
* commit 'dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
Make the appropriate cast to protect from mingw.
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index a4e5d3de69c1..1b30d362a716 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -2107,7 +2107,7 @@ static status_t writeResourceLoadedCallbackForLayoutClasses( indentStr); } - return hasErrors ? UNKNOWN_ERROR : NO_ERROR; + return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR; } static status_t writeResourceLoadedCallback( |