diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-01-15 16:41:29 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2013-01-15 16:41:29 -0800 |
| commit | b7de2194d54eb81b1db4b50c171ddd0339831155 (patch) | |
| tree | 03a09c0ff25281d52f69c773bfc44399b68b1716 /tools | |
| parent | e45113a1564c6e701fcc076813bee276d501c576 (diff) | |
| parent | c71c678e9b6a4278337b69f2c60c0fbe9988bf93 (diff) | |
| download | frameworks_base-b7de2194d54eb81b1db4b50c171ddd0339831155.zip frameworks_base-b7de2194d54eb81b1db4b50c171ddd0339831155.tar.gz frameworks_base-b7de2194d54eb81b1db4b50c171ddd0339831155.tar.bz2 | |
resolved conflicts for merge of c71c678e to master
Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Command.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index b98925b..5cec06f 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1852,7 +1852,13 @@ int doSingleCrunch(Bundle* bundle) String8 input(bundle->getSingleCrunchInputFile()); String8 output(bundle->getSingleCrunchOutputFile()); - return preProcessImageToCache(bundle, input, output); + + if (preProcessImageToCache(bundle, input, output) != NO_ERROR) { + // we can't return the status_t as it gets truncate to the lower 8 bits. + return 42; + } + + return NO_ERROR; } char CONSOLE_DATA[2925] = { |