diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apex/apex.go b/apex/apex.go index f9c902cf2..9905b7954 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -704,7 +704,7 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) { if !ok || !am.CanHaveApexVariants() { return false } - if !parent.(android.DepIsInSameApex).DepIsInSameApex(mctx, child) && !inAnySdk(child) { + if !parent.(android.DepIsInSameApex).DepIsInSameApex(mctx, child) { return false } if excludeVndkLibs { @@ -2162,10 +2162,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { return false } if cc.UseVndk() && proptools.Bool(a.properties.Use_vndk_as_stable) && cc.IsVndk() { - // For vendor APEX with use_vndk_as_stable: true, we don't include VNDK libs - // and use them from VNDK APEX. - // TODO(b/159576928): add "vndk" as requiredDeps so that linkerconfig can make "vndk" - // linker namespace avaiable to this apex. + requireNativeLibs = append(requireNativeLibs, ":vndk") return false } af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs) |