diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-25 14:20:21 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2016-04-30 01:36:12 +0000 |
| commit | 458b877488c12ea4336d8fc00a95d9c0298bd6d0 (patch) | |
| tree | 6169f78510254f6bde737279763049f00eaef200 /tools/aapt2/ResourceUtils.cpp | |
| parent | 832449800e2e5068ab0eb986bb359906ddf6efdc (diff) | |
AAPT2: Add diff command
Adds the diff command and various small fixes to issues
discovered when diffing old AAPT built APKs with new AAPT2
built APKS.
Bug:22775504
Change-Id: I682a7fe1cf4b3efa7cbd5d18b333cf2d1046fe1b
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index 74c48b0f8426..a0a7efc46476 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -289,7 +289,7 @@ std::unique_ptr<BinaryPrimitive> tryParseEnumSymbol(const Attribute* enumAttr, std::unique_ptr<BinaryPrimitive> tryParseFlagSymbol(const Attribute* flagAttr, const StringPiece16& str) { android::Res_value flags = { }; - flags.dataType = android::Res_value::TYPE_INT_DEC; + flags.dataType = android::Res_value::TYPE_INT_HEX; flags.data = 0u; if (util::trimWhitespace(str).empty()) { |