Restore the test for bionic being in an APEX.

am: 49a25cbc7c

Change-Id: Id397863cba8e8fe3fb5d7f4d1651a180d8e41c5e
This commit is contained in:
Peter Collingbourne
2019-05-21 22:40:52 -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 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. // Bionic libraries (e.g. libc.so) is installed to the bootstrap subdirectory.
// The original path becomes a symlink to the corresponding file in the // The original path becomes a symlink to the corresponding file in the
// runtime APEX. // runtime APEX.