Commit fb6abbc3 authored Nov 14, 2023 by Alyssa Ketpreechasawat Committed by Automerger Merge Worker Nov 14, 2023

Merge "Skip unknown check in bootclasspath_fragment (source version) if...

Merge "Skip unknown check in bootclasspath_fragment (source version) if prebuilt version is in use." into main am: 378c7a39

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

Change-Id: Ifb8a17a7dbf6f73bb727b2fce78b622cb09181a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

java/bootclasspath_fragment.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -582,7 +582,7 @@ func (b *BootclasspathFragmentModule) configuredJars(ctx android.ModuleContext)
		// So ignore it even if it is not in PRODUCT_APEX_BOOT_JARS.
		// TODO(b/202896428): Add better way to handle this.
		_, unknown = android.RemoveFromList("android.car-module", unknown)
		if len(unknown) > 0 {
		if isActiveModule(ctx.Module()) && len(unknown) > 0 {
		ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_BOOT_JARS", unknown)
		}
		}