From 09dbc010b0dd9055f919e639467691269fb15264 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 18 Dec 2024 13:45:58 -0800 Subject: Correctly compute externalDep for dependencies of override_apex modules The externalDep computation in WalkPayloadDeps was comparing ctx.ModuleName() against InApexVariants, but override_apex modules create an extra variation of the base apex, so ctx.ModuleName() doesn't match the apex variation name. Use the override name instead of the module name for override apex variations. Bug: 372543712 Test: go test ./apex Change-Id: If7a92ca0034bb37f6b0fc7b194ea55c918469d08 --- apex/bootclasspath_fragment_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'apex/bootclasspath_fragment_test.go') diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index d0bff625d..a650d1146 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -242,6 +242,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { apex_available: [ "com.android.art", ], + min_sdk_version: "33", } `, content) } -- cgit v1.2.3-59-g8ed1b