From 3b3a0114089ca97ac36ca37a4cea72f98a2018bb Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 3 Jan 2024 15:16:55 -0800 Subject: [PATCH] Check for errors in preparer.sh In case any of the commands fail. Also skip writing out empty preparer.sh files. Bug: 314933937 Test: Presubmits Change-Id: Ia94d032bc4800379608d8a3cf594f25951a3ab32 --- android/packaging.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/packaging.go b/android/packaging.go index 2506378d7..8873540c5 100644 --- a/android/packaging.go +++ b/android/packaging.go @@ -240,10 +240,14 @@ func (p *PackagingBase) GatherPackagingSpecs(ctx ModuleContext) map[string]Packa // CopySpecsToDir is a helper that will add commands to the rule builder to copy the PackagingSpec // entries into the specified directory. func (p *PackagingBase) CopySpecsToDir(ctx ModuleContext, builder *RuleBuilder, specs map[string]PackagingSpec, dir WritablePath) (entries []string) { + if len(specs) == 0 { + return entries + } seenDir := make(map[string]bool) preparerPath := PathForModuleOut(ctx, "preparer.sh") cmd := builder.Command().Tool(preparerPath) var sb strings.Builder + sb.WriteString("set -e\n") for _, k := range SortedKeys(specs) { ps := specs[k] destPath := filepath.Join(dir.String(), ps.relPathInPackage)