diff options
| author | 2025-02-11 11:40:13 -0800 | |
|---|---|---|
| committer | 2025-02-11 11:40:13 -0800 | |
| commit | 1dc3511441bae21a32481a22ef7ce8f61a7a2388 (patch) | |
| tree | 4ef8d45c9ba3ab91eff15d5b8e4840b093dc017e /java/hiddenapi_singleton.go | |
| parent | 434953e9547aaa6d21c7a124a89f9a3695a9fc4d (diff) | |
| parent | 6db3e6ffd9b89424d1c78917f80bfaf071c41902 (diff) | |
Merge changes from topics "apex_transition_info", "bcp_dependency_through_apex" into main am: 5c846d8349 am: 6db3e6ffd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3470502
Change-Id: I9557fe50d5bdae792487fbc06e64c4b9473c65a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 7d21b7a61..2c8694237 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -171,11 +171,11 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu // Now match the apex part of the boot image configuration. requiredApex := configuredBootJars.Apex(index) if android.IsConfiguredJarForPlatform(requiredApex) { - if len(apexInfo.InApexVariants) != 0 { + if apexInfo.ApexVariationName != "" { // A platform variant is required but this is for an apex so ignore it. return false } - } else if !apexInfo.InApexVariant(requiredApex) { + } else if apexInfo.BaseApexName != requiredApex { // An apex variant for a specific apex is required but this is the wrong apex. return false } |