diff options
| author | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
| commit | 220871a697290529278ed16db508eda8e12f3fc7 (patch) | |
| tree | bc13101b63c6fe39a9d92706ecb7ded7f98f5a9c /tools/aapt2/java/ManifestClassGenerator.cpp | |
| parent | 802f191b2b84a1b1b82c7f6f3268846084b35dfb (diff) | |
| parent | 98e12851336b7db16e583f9afac63ecc97465980 (diff) | |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
Diffstat (limited to 'tools/aapt2/java/ManifestClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/ManifestClassGenerator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aapt2/java/ManifestClassGenerator.cpp b/tools/aapt2/java/ManifestClassGenerator.cpp index f49e4985fcf1..cad4c6c7c94f 100644 --- a/tools/aapt2/java/ManifestClassGenerator.cpp +++ b/tools/aapt2/java/ManifestClassGenerator.cpp @@ -81,7 +81,10 @@ static bool WriteSymbol(const Source& source, IDiagnostics* diag, util::make_unique<StringMember>(result.value(), attr->value); string_member->GetCommentBuilder()->AppendComment(el->comment); - class_def->AddMember(std::move(string_member)); + if (class_def->AddMember(std::move(string_member)) == ClassDefinition::Result::kOverridden) { + diag->Warn(DiagMessage(source.WithLine(el->line_number)) + << "duplicate definitions of '" << result.value() << "', overriding previous"); + } return true; } |