Merge "Remove VNDK related code from Soong" into aosp-main-future
This commit is contained in:
@@ -960,11 +960,6 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
|
||||
if a.minSdkVersionValue(mctx) != "" {
|
||||
mctx.PropertyErrorf("use_vndk_as_stable", "not supported when min_sdk_version is set")
|
||||
}
|
||||
mctx.VisitDirectDepsWithTag(sharedLibTag, func(dep android.Module) {
|
||||
if c, ok := dep.(*cc.Module); ok && c.IsVndk() {
|
||||
mctx.PropertyErrorf("use_vndk_as_stable", "Trying to include a VNDK library(%s) while use_vndk_as_stable is true.", dep.Name())
|
||||
}
|
||||
})
|
||||
if mctx.Failed() {
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user