Ignore some prebuilt vndk libs for trunk-stable next
Source tree may include prebuilt vndk snapshot libs that are newer than or equal to the PLATFORM_VNDK_VERSION. Ignore those prebuilt vndk snapshot libs. Bug: 296488609 Test: lunch cf_x86_64_phone-next-userdebug; m nothing Change-Id: I3adaf3b7636f53884f08540959d2ec2fddfb6921
This commit is contained in:
@@ -131,6 +131,12 @@ func (p *vndkPrebuiltLibraryDecorator) singleSourcePath(ctx ModuleContext) andro
|
||||
|
||||
func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
|
||||
flags Flags, deps PathDeps, objs Objects) android.Path {
|
||||
platformVndkApiLevel := android.ApiLevelOrPanic(ctx, ctx.DeviceConfig().PlatformVndkVersion())
|
||||
if platformVndkApiLevel.LessThanOrEqualTo(android.ApiLevelOrPanic(ctx, p.Version())) {
|
||||
// This prebuilt VNDK module is not required for the current build
|
||||
ctx.Module().HideFromMake()
|
||||
return nil
|
||||
}
|
||||
|
||||
if !p.MatchesWithDevice(ctx.DeviceConfig()) {
|
||||
ctx.Module().HideFromMake()
|
||||
|
Reference in New Issue
Block a user