Restore the test for bionic being in an APEX. am: 49a25cbc7c am: 34acae298d am: 51e434c8d3

am: e9945dc81c

Change-Id: Idd10d9913163cc2e803b79a9005e4f6504a28b19
This commit is contained in:
Peter Collingbourne
2019-05-22 09:18:36 -07:00
committed by android-build-merger

View File

@@ -957,7 +957,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
library.baseInstaller.subDir += "-" + vndkVersion
}
}
} else if len(library.Properties.Stubs.Versions) > 0 {
} else if len(library.Properties.Stubs.Versions) > 0 && android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
// Bionic libraries (e.g. libc.so) is installed to the bootstrap subdirectory.
// The original path becomes a symlink to the corresponding file in the
// runtime APEX.