summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-09 18:09:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-09 18:09:11 +0000
commitd9f32b164be11b6c42ee36ca6945623073e82c99 (patch)
tree6d79e711e0d07ab75cb8fb1e4c7ad8b2e17f18c7
parente26347bb740f5d1bcf51036e63c1b1c91e685f4c (diff)
parenta18cee52d953196ce12550df2ac5a14fbf359802 (diff)
downloadframeworks_base-d9f32b164be11b6c42ee36ca6945623073e82c99.zip
frameworks_base-d9f32b164be11b6c42ee36ca6945623073e82c99.tar.gz
frameworks_base-d9f32b164be11b6c42ee36ca6945623073e82c99.tar.bz2
Merge "Ensure alignment of Res_png_9patch."
-rw-r--r--include/androidfw/ResourceTypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index 8673219..0822afd 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -112,7 +112,7 @@ struct __assertChar16Size {
*
* The PNG chunk type is "npTc".
*/
-struct Res_png_9patch
+struct alignas(uintptr_t) Res_png_9patch
{
Res_png_9patch() : wasDeserialized(false), xDivsOffset(0),
yDivsOffset(0), colorsOffset(0) { }