Merge cherrypicks of ['googleplex-android-review.googlesource.com/29581937'] into 24Q4-release.

Change-Id: I5b74b78edb91a6c4978f0d6a7cd930e738af21bf
This commit is contained in:
Android Build Coastguard Worker
2024-09-25 20:06:02 +00:00

View File

@@ -27,6 +27,7 @@ import (
"strings" "strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
"syscall"
"time" "time"
"android/soong/ui/tracer" "android/soong/ui/tracer"
@@ -780,7 +781,7 @@ func checkGlobs(ctx Context, finalOutFile string) error {
hasNewDep := false hasNewDep := false
for _, dep := range cachedGlob.Deps { for _, dep := range cachedGlob.Deps {
info, err := os.Stat(dep) info, err := os.Stat(dep)
if errors.Is(err, fs.ErrNotExist) { if errors.Is(err, fs.ErrNotExist) || errors.Is(err, syscall.ENOTDIR) {
hasNewDep = true hasNewDep = true
break break
} else if err != nil { } else if err != nil {