commit ec26327735fc4da4116292e68e80df2f7cb9bcfa
author Alan Viverette <alanv@google.com> Mon Oct 23 13:16:52 2023 -0400
committer Alan Viverette <alanv@google.com> Mon Oct 23 13:25:13 2023 -0400
tree 266e1413b82caa1d132036bf63f6280b8d0029bb
parent c70be4b986b0d2ec52c6a899b3c6d7fb0015b9bf

Handle Android.bp files in subdirectories of androidx

Bug: 304263344
Test: m droid
Change-Id: I473d017ed3169137cc234f7fbd5f01d5ad889cb2

java/support_libraries.go

diff --git a/java/support_libraries.go b/java/support_libraries.go
index af7c3c2..c483fc1 100644
--- a/java/support_libraries.go
+++ b/java/support_libraries.go
@@ -32,7 +32,7 @@
 		dir := ctx.ModuleDir(module)
 		switch {
 		case strings.HasPrefix(dir, "prebuilts/sdk/current/extras"),
-			dir == "prebuilts/sdk/current/androidx",
+			strings.HasPrefix(dir, "prebuilts/sdk/current/androidx"),
 			dir == "prebuilts/sdk/current/car",
 			dir == "prebuilts/sdk/current/optional",
 			dir == "prebuilts/sdk/current/support":