diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-05-26 17:33:38 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-05-26 17:38:34 -0700 |
| commit | 4488f1c74a0f7df09f2b201f7caa228d729e8389 (patch) | |
| tree | 84b28ff7c770f906f0a58cf280ec28ecc3a58f68 /tools/aapt2/ResourceTable.h | |
| parent | 2354b568379fe31ba4e774f7a92d4c685a60a2ab (diff) | |
AAPT2: Fix <add-resource> tag for overlays
Bug: 38355988
Test: make aapt2_tests
Change-Id: Iea8887f55f8ceb2c15bd963405fd132916173c0c
Diffstat (limited to 'tools/aapt2/ResourceTable.h')
| -rw-r--r-- | tools/aapt2/ResourceTable.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h index b0321214c6cc..4295d0674774 100644 --- a/tools/aapt2/ResourceTable.h +++ b/tools/aapt2/ResourceTable.h @@ -50,6 +50,10 @@ enum class SymbolState { struct Symbol { SymbolState state = SymbolState::kUndefined; Source source; + + // Whether this entry (originating from an overlay) can be added as a new resource. + bool allow_new = false; + std::string comment; }; @@ -223,8 +227,7 @@ class ResourceTable { bool SetSymbolState(const ResourceNameRef& name, const ResourceId& res_id, const Symbol& symbol, IDiagnostics* diag); - bool SetSymbolStateAllowMangled(const ResourceNameRef& name, - const ResourceId& res_id, + bool SetSymbolStateAllowMangled(const ResourceNameRef& name, const ResourceId& res_id, const Symbol& symbol, IDiagnostics* diag); struct SearchResult { |