diff options
| author | 2023-11-14 19:13:32 +0000 | |
|---|---|---|
| committer | 2023-11-14 19:13:32 +0000 | |
| commit | 378c7a395330ed8d8840c4c56e8124631ffa539c (patch) | |
| tree | a501f8d2f092a7c1057d1f24e5ce11a92f0b5157 /java/bootclasspath_fragment.go | |
| parent | 7dc019e8cb2639e79f3e63e09bc872acea008584 (diff) | |
| parent | a0cf0a4a6686bbed09e07397423a6ce2cad586c4 (diff) | |
Merge "Skip unknown check in bootclasspath_fragment (source version) if prebuilt version is in use." into main
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 7d8a9f7bb..e92e6e68f 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -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) } } |