diff options
| author | 2025-02-11 11:26:59 -0800 | |
|---|---|---|
| committer | 2025-02-11 11:26:59 -0800 | |
| commit | 1e8e703e0e9afff70e81844fe602a4cf121f0123 (patch) | |
| tree | 8c7d76daf0defe26a5dc802c891ef5d23b54f120 /java/bootclasspath_fragment.go | |
| parent | 49740c91763ee0ee009580a0027756dee34d2ff6 (diff) | |
| parent | d649580f3d46b39f8837d668063f9b8ebde0474a (diff) | |
Convert apex transition tag to dependency on apex am: d649580f3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3452160
Change-Id: I2bec7016b36db9fca3b0cd21e93cafe71bb37724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 4d35b9fa5..f3bff12f2 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -621,7 +621,7 @@ func (b *BootclasspathFragmentModule) configuredJars(ctx android.ModuleContext) if android.IsModulePrebuilt(ctx.Module()) { // prebuilt bcpf. the validation of this will be done at the top-level apex providerClasspathFragmentValidationInfoProvider(ctx, unknown) - } else if !disableSourceApexVariant(ctx) { + } else if !disableSourceApexVariant(ctx) && android.IsModulePreferred(ctx.Module()) { // source bcpf, and prebuilt apex are not selected. ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_BOOT_JARS", unknown) } |