From bdd47a863a9ca7bb5a20836936765513b9cf68f6 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 27 Feb 2020 13:29:56 +0000 Subject: [PATCH] Avoid invoking sdk member to add empty list of dependencies Simplifies debugging sdk membership code when it is only called if an appropriate member is present. Bug: 153306490 Test: m nothing Merged-In: I32bc93e0484c829bdbd6b050822249feb6404f89 Change-Id: I32bc93e0484c829bdbd6b050822249feb6404f89 --- sdk/sdk.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/sdk.go b/sdk/sdk.go index 4976dc030..c194ac1f8 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -323,8 +323,10 @@ func memberMutator(mctx android.BottomUpMutatorContext) { if s.Enabled() { for _, memberListProperty := range s.memberListProperties() { names := memberListProperty.getter(s.dynamicMemberTypeListProperties) - tag := memberListProperty.dependencyTag - memberListProperty.memberType.AddDependencies(mctx, tag, names) + if len(names) > 0 { + tag := memberListProperty.dependencyTag + memberListProperty.memberType.AddDependencies(mctx, tag, names) + } } } }