Merge changes from topic "musl_arm64" am: b3f28b2e04

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2575412

Change-Id: Ia86f100f646a054eb286ccb6a96c5c6414d90643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-05-19 18:45:09 +00:00
committed by Automerger Merge Worker

View File

@@ -665,6 +665,21 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
s.Diag.Cfi = nil
}
// TODO(b/280478629): runtimes don't exist for musl arm64 yet.
if ctx.toolchain().Musl() && ctx.Arch().ArchType == android.Arm64 {
s.Address = nil
s.Hwaddress = nil
s.Thread = nil
s.Scudo = nil
s.Fuzzer = nil
s.Cfi = nil
s.Diag.Cfi = nil
s.Misc_undefined = nil
s.Undefined = nil
s.All_undefined = nil
s.Integer_overflow = nil
}
// Also disable CFI for VNDK variants of components
if ctx.isVndk() && ctx.useVndk() {
s.Cfi = nil