| commit | d20ed1dfc861ece0fe0058bab9775523787a3ebe | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Tue Mar 08 03:01:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 03:01:29 2022 +0000 |
| tree | ed16127bd4ddc498c2e61d7367f51590805b9f45 | |
| parent | 9d098cad906f877909da0bf73580ed97a9636d32 [diff] | |
| parent | 8c7cbf01a9b4fcf22ea06493e85f3a7e5eea270c [diff] |
Merge "init: Skip interface duplicates if service is an override" am: 8c7cbf01a9 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2009975 Change-Id: I3c32b073ce86e4f98593a7e27181fd9df83009c5
diff --git a/init/service_parser.cpp b/init/service_parser.cpp index 57c311a..35bd415 100644 --- a/init/service_parser.cpp +++ b/init/service_parser.cpp
@@ -202,7 +202,7 @@ const std::string fullname = interface_name + "/" + instance_name; for (const auto& svc : *service_list_) { - if (svc->interfaces().count(fullname) > 0) { + if (svc->interfaces().count(fullname) > 0 && !service_->is_override()) { return Error() << "Interface '" << fullname << "' redefined in " << service_->name() << " but is already defined by " << svc->name(); }