Merge "Allow skipping android.car-module library in PRODUCT_APEX_BOOT_JARS"
This commit is contained in:
committed by
Android (Google) Code Review
commit
46679cdbf3
@@ -621,6 +621,10 @@ func (b *BootclasspathFragmentModule) configuredJars(ctx android.ModuleContext)
|
||||
} else if global.ApexBootJars.Len() != 0 && !android.IsModuleInVersionedSdk(ctx.Module()) {
|
||||
unknown = android.RemoveListFromList(unknown, b.properties.Coverage.Contents)
|
||||
_, unknown = android.RemoveFromList("core-icu4j", unknown)
|
||||
// This module only exists in car products.
|
||||
// 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 {
|
||||
ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_BOOT_JARS", unknown)
|
||||
}
|
||||
|
Reference in New Issue
Block a user