commit cbd3f0c59a75e0b46dbb0635e81f82b8b9617791
author Tamas Berghammer <tberghammer@google.com> Wed Jun 22 15:21:38 2016 +0100
committer Tamas Berghammer <tberghammer@google.com> Wed Jan 11 11:27:38 2017 +0000
tree 7bb28156a002092d8212647a20490314bdb849b8
parent 4911e517ab4c7434cb2a93eafe6ce4ed4477046e

Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc3a4a615faf249bf4f126f42e80b82e)

tools/aapt2/compile/Png.cpp

diff --git a/tools/aapt2/compile/Png.cpp b/tools/aapt2/compile/Png.cpp
index bbf7f41..8bf2a49 100644
--- a/tools/aapt2/compile/Png.cpp
+++ b/tools/aapt2/compile/Png.cpp
@@ -224,6 +224,13 @@
     }
 }*/
 
+#ifdef MAX
+#undef MAX
+#endif
+#ifdef ABS
+#undef ABS
+#endif
+
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define ABS(a)   ((a)<0?-(a):(a))