From 478ca5b79e3e438a04bd838c9e1f17769d728e92 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 11 Aug 2023 23:33:05 +0000 Subject: [PATCH] Move scopeOrderedSourceFileNames as outside var This change enables scopeOrderedSourceFileNames to be not computed everytime when the function is called, but instead is computed once. Test: m Bug: 295429988 Change-Id: I33846cdb7a750e44e45049dbd342aa6ab8b70c4c --- java/java.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java.go b/java/java.go index 988a07492..6667a52f1 100644 --- a/java/java.go +++ b/java/java.go @@ -1812,14 +1812,14 @@ func (al *ApiLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { } } +// API signature file names sorted from +// the narrowest api scope to the widest api scope +var scopeOrderedSourceFileNames = allApiScopes.Strings( + func(s *apiScope) string { return s.apiFilePrefix + "current.txt" }) + func (al *ApiLibrary) sortApiFilesByApiScope(ctx android.ModuleContext, srcFiles android.Paths) android.Paths { sortedSrcFiles := android.Paths{} - // API signature file name sorted from - // the narrowest api scope to the widest api scope - scopeOrderedSourceFileNames := allApiScopes.Strings( - func(s *apiScope) string { return s.apiFilePrefix + "current.txt" }) - for _, scopeSourceFileName := range scopeOrderedSourceFileNames { for _, sourceFileName := range srcFiles { if sourceFileName.Base() == scopeSourceFileName {