Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073 am: 5daaffb9db

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I89fe23c1923093498d53147b9242a3c980a39474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/bazel.go

@@ -341,16 +341,19 @@ 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 true
+			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")