Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97633e43 authored by Alan Viverette's avatar Alan Viverette Committed by Automerger Merge Worker
Browse files

Handle Android.bp files in subdirectories of androidx am: ec263277 

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



Change-Id: I466fc52ff56ce2bab213cada9efbeb265a45802d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87935767 ec263277

java/support_libraries.go

+1 −1
Original line number Diff line number Diff line
@@ -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":