diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-04-03 00:06:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-03 00:06:34 +0000 |
| commit | e6c28f7c3a7f148bf91dcc5d05642997dff09e9f (patch) | |
| tree | b77d2e2132ef718c50ef4606420764a7ee43b97e /include | |
| parent | d945e6b4850cf2257f12e6abdb685198fb2fdbb9 (diff) | |
| parent | 6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb (diff) | |
| download | frameworks_base-e6c28f7c3a7f148bf91dcc5d05642997dff09e9f.zip frameworks_base-e6c28f7c3a7f148bf91dcc5d05642997dff09e9f.tar.gz frameworks_base-e6c28f7c3a7f148bf91dcc5d05642997dff09e9f.tar.bz2 | |
Merge "AAPT2"
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 65160d5..a5776a4 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1333,7 +1333,11 @@ struct ResTable_entry FLAG_COMPLEX = 0x0001, // If set, this resource has been declared public, so libraries // are allowed to reference it. - FLAG_PUBLIC = 0x0002 + FLAG_PUBLIC = 0x0002, + // If set, this is a weak resource and may be overriden by strong + // resources of the same name/type. This is only useful during + // linking with other resource tables. + FLAG_WEAK = 0x0004 }; uint16_t flags; |