commit edba94106473b8d7b3aa8a4805d2e45497084755
author Adam Lesinski <adamlesinski@google.com> Tue Oct 04 17:33:04 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue Oct 04 17:50:19 2016 -0700
tree 4d7dac70d4531859acde8f65931862903544265f
parent 1b219d06e397880e65b7af25a000954a3a39567a

AAPT2: Ensure PNG endianness in 9-patch serialization

9-patch serialization requires PNG endianness

Bug:31942900
Test: manual + added serialization test to libaapt2_tests
Change-Id: Iea521718f88e80d3fa7a8723a47584973738748a

tools/aapt2/compile/NinePatch.cpp

diff --git a/tools/aapt2/compile/NinePatch.cpp b/tools/aapt2/compile/NinePatch.cpp
index 408ecf7..0fc1c5d 100644
--- a/tools/aapt2/compile/NinePatch.cpp
+++ b/tools/aapt2/compile/NinePatch.cpp
@@ -598,6 +598,9 @@
                                        (const int32_t*) verticalStretchRegions.data(),
                                        regionColors.data(),
                                        buffer.get());
+    // Convert to file endianness.
+    reinterpret_cast<android::Res_png_9patch*>(buffer.get())->deviceToFile();
+
     *outLen = data.serializedSize();
     return buffer;
 }
@@ -661,7 +664,9 @@
 }
 
 ::std::ostream& operator<<(::std::ostream& out, const NinePatch& ninePatch) {
-    return out << "padding: " << ninePatch.padding
+    return out << "horizontalStretch:" << util::joiner(ninePatch.horizontalStretchRegions, " ")
+            << " verticalStretch:" << util::joiner(ninePatch.verticalStretchRegions, " ")
+            << " padding: " << ninePatch.padding
             << ", bounds: " << ninePatch.layoutBounds
             << ", outline: " << ninePatch.outline
             << " rad=" << ninePatch.outlineRadius