diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-07-18 17:01:14 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2016-07-18 17:07:41 -0700 |
commit | 526d73be4a3a2714fa6112769e16fb6cd0194451 (patch) | |
tree | 5b1f6862bed22be84c5547ad0bb2b2c317604b45 /tools/aapt/Images.cpp | |
parent | 699e1bc74bb00d81b9680c826828678847caf205 (diff) |
AAPT: Don't keep processing files that failed to be added
AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.
Bug:30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937
Diffstat (limited to 'tools/aapt/Images.cpp')
-rw-r--r-- | tools/aapt/Images.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 9939c188cdd9..aea16c715b95 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -808,13 +808,13 @@ static void checkNinePatchSerialization(Res_png_9patch* inPatch, void* data) assert(outPatch->paddingTop == inPatch->paddingTop); assert(outPatch->paddingBottom == inPatch->paddingBottom); for (int i = 0; i < outPatch->numXDivs; i++) { - assert(outPatch->xDivs[i] == inPatch->xDivs[i]); + assert(outPatch->getXDivs()[i] == inPatch->getXDivs()[i]); } for (int i = 0; i < outPatch->numYDivs; i++) { - assert(outPatch->yDivs[i] == inPatch->yDivs[i]); + assert(outPatch->getYDivs()[i] == inPatch->getYDivs()[i]); } for (int i = 0; i < outPatch->numColors; i++) { - assert(outPatch->colors[i] == inPatch->colors[i]); + assert(outPatch->getColors()[i] == inPatch->getColors()[i]); } free(newData); } |