Merge "ShouldKeepExistingBuldFileForDir look up by dir"

android/bazel.go

@@ -341,17 +341,20 @@ func (a Bp2BuildConversionAllowlist) ShouldKeepExistingBuildFileForDir(dir strin
 		// Exact dir match
 		return true
 	}
+	var i int
 	// Check if subtree match
-	for prefix, recursive := range a.keepExistingBuildFile {
+	for {
-		if recursive {
+		j := strings.Index(dir[i:], "/")
-			if strings.HasPrefix(dir, prefix+"/") {
+		if j == -1 {
+			return false //default
+		}
+		prefix := dir[0 : i+j]
+		i = i + j + 1 // skip the "/"
+		if recursive, ok := a.keepExistingBuildFile[prefix]; ok && recursive {
 			return true
 		}
 	}
 }
-	// Default
-	return false
-}
 
 var bp2BuildAllowListKey = NewOnceKey("Bp2BuildAllowlist")
 var bp2buildAllowlist OncePer