diff options
| author | 2024-12-11 00:40:51 +0000 | |
|---|---|---|
| committer | 2024-12-11 00:40:51 +0000 | |
| commit | aecbbc24dea1a92b8ce7eab4fb88de128f4e46b7 (patch) | |
| tree | 547ab24d81c43fe816961d073222d9c0424f0eb0 /java/base.go | |
| parent | cbcc9091842356f0e3cf53c779a760397a5fdf98 (diff) | |
| parent | c4179b5f7fc5e6de0ce27d9583ff5edfc93389c0 (diff) | |
Merge "Convert checkApexAvailability to use ModuleProxy." into main am: c4179b5f7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3400526
Change-Id: I1baae4c7e131522be7cc95440c948b58c16db6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/base.go b/java/base.go index f26404b8c..b579a5d0f 100644 --- a/java/base.go +++ b/java/base.go @@ -838,13 +838,18 @@ func (j *Module) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLev } func (j *Module) AvailableFor(what string) bool { - if what == android.AvailableToPlatform && Bool(j.deviceProperties.Hostdex) { + return android.CheckAvailableForApex(what, j.ApexAvailableFor()) +} + +func (j *Module) ApexAvailableFor() []string { + list := j.ApexModuleBase.ApexAvailable() + if Bool(j.deviceProperties.Hostdex) { // Exception: for hostdex: true libraries, the platform variant is created // even if it's not marked as available to platform. In that case, the platform // variant is used only for the hostdex and not installed to the device. - return true + list = append(list, android.AvailableToPlatform) } - return j.ApexModuleBase.AvailableFor(what) + return android.FirstUniqueStrings(list) } func (j *Module) staticLibs(ctx android.BaseModuleContext) []string { |