Add handling for libc_hwasan to Soong
libc_hwasan is a new library in the runtime apex that lives in
bionic/hwasan/libc.so and is symlinked to /system/lib64/hwasan/libc.so.
This is chosen by the linker if an app or binary requires HWASan
support.
Bug: 276930343
Change-Id: If331744ad84241ad99a41805ea3110d37cf9b0af
diff --git a/apex/apex.go b/apex/apex.go
index 5451a04..4fda505 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1659,7 +1659,6 @@
if ccMod.Target().NativeBridge == android.NativeBridgeEnabled {
dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath)
}
- dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())
if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), ctx.Config()) {
// Special case for Bionic libs and other libs installed with them. This is to
// prevent those libs from being included in the search path
@@ -1672,6 +1671,10 @@
// loading of them, which isn't supported.
dirInApex = filepath.Join(dirInApex, "bionic")
}
+ // This needs to go after the runtime APEX handling because otherwise we would get
+ // weird paths like lib64/rel_install_path/bionic rather than
+ // lib64/bionic/rel_install_path.
+ dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())
fileToCopy := android.OutputFileForModule(ctx, ccMod, "")
androidMkModuleName := ccMod.BaseModuleName() + ccMod.Properties.SubName