commit ca2fc353c2b07e24e297fdc8426c7abd601d908b
author Adam Lesinski <adamlesinski@google.com> Fri Apr 03 12:08:26 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Fri Apr 03 12:33:02 2015 -0700
tree 2f9242af3558209ac265fb7d2d1164652f78d8de
parent 7e3a19ac85d30abade971d8d0a948b4599d97c9e

Fix windows build of AAPT2

Change-Id: Ib8e1a4322510b582e9600a08d3118842c9abc73c

tools/aapt2/ResourceParser.cpp

diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index d3720c4..4c96187 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -973,7 +973,7 @@
 
     std::unique_ptr<Attribute> attr = util::make_unique<Attribute>(weak);
     attr->symbols.swap(items);
-    attr->typeMask = typeMask ? typeMask : android::ResTable_map::TYPE_ANY;
+    attr->typeMask = typeMask ? typeMask : uint32_t(android::ResTable_map::TYPE_ANY);
     return attr;
 }