diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-16 02:25:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-16 02:25:22 +0000 |
| commit | 46736ec81c2a35d450b2c2d86ca3423cd92a225d (patch) | |
| tree | 47e971fdba33b805440a12bf58fdaca3df1281b0 /tools/aapt/Resource.cpp | |
| parent | 3ee3b9d17b2aec84e791f3efa6b9453cab0d9c9b (diff) | |
| parent | 2edfa8c9b00cd0c0bd18738f75e0928394b99c76 (diff) | |
Merge "Make the appropriate cast to protect from mingw." am: dbf8c17bd2
am: 2edfa8c9b0
* commit '2edfa8c9b00cd0c0bd18738f75e0928394b99c76':
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 576f076f4a3f..4d9ba6c95d9e 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -2119,7 +2119,7 @@ static status_t writeResourceLoadedCallbackForLayoutClasses( indentStr); } - return hasErrors ? UNKNOWN_ERROR : NO_ERROR; + return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR; } static status_t writeResourceLoadedCallback( |