From ec26327735fc4da4116292e68e80df2f7cb9bcfa Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 23 Oct 2023 13:16:52 -0400 Subject: [PATCH] Handle Android.bp files in subdirectories of androidx Bug: 304263344 Test: m droid Change-Id: I473d017ed3169137cc234f7fbd5f01d5ad889cb2 --- java/support_libraries.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/support_libraries.go b/java/support_libraries.go index af7c3c2a0..c483fc17a 100644 --- a/java/support_libraries.go +++ b/java/support_libraries.go @@ -32,7 +32,7 @@ func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) { 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":