diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-05-20 16:47:08 -0700 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2019-06-06 14:19:26 +0000 |
| commit | c1676807f45a862256fb5b2804f15dbf4a90a11e (patch) | |
| tree | d5377d9c595423001bdb097cac88488b1cb1ee1d /tools/aapt2/ResourceValues.h | |
| parent | e05fdd2f7270296e7e965d8f3e8dc2badfb6ef95 (diff) | |
Retain parsed attribute type
If the value of an attribute enum is defined as a hexadecimal integer,
flatten uses of the attribute as with the
android::Res_value::TYPE_INT_HEX type.
This change adds a "type" field to pb::Attribute::Symbol, which if left
unset, will have a default value of android::Res_value::TYPE_INT_DEC
when deserialized by aapt2.
Bug: 124474141
Test: aapt2_tests and manual compilation of files and inspection using
`aapt2 dump chunks`
Change-Id: Ibf12394284fdbe3a8047f7ecf4fe68517dfc3abb
Diffstat (limited to 'tools/aapt2/ResourceValues.h')
| -rw-r--r-- | tools/aapt2/ResourceValues.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h index 168ad61784e7..fe0883be50aa 100644 --- a/tools/aapt2/ResourceValues.h +++ b/tools/aapt2/ResourceValues.h @@ -292,6 +292,7 @@ struct Attribute : public BaseValue<Attribute> { struct Symbol { Reference symbol; uint32_t value; + uint8_t type; friend std::ostream& operator<<(std::ostream& out, const Symbol& symbol); }; |