commit f06dd914200a4a231595d65d32317d3123b7d423
author Trevor Radcliffe <tradical@google.com> Fri May 19 14:51:41 2023 +0000
committer Trevor Radcliffe <tradical@google.com> Fri May 19 14:51:41 2023 +0000
tree b9f13eea100efc5183b5f38ed479c52044e8ed03
parent 3daa129afaeb95380edcef7316e441ac19b192ea

CFI Versionscript changes in bp2build

Bug: 261733820
Test: Unit Tests
Change-Id: I0bf2f42944738c0fefb10e59e859d2af44402792

cc/bp2build.go

diff --git a/cc/bp2build.go b/cc/bp2build.go
index fa98df4..259ba39 100644
--- a/cc/bp2build.go
+++ b/cc/bp2build.go
@@ -1257,6 +1257,7 @@
 		label := android.BazelLabelForModuleSrcSingle(ctx, *props.Version_script)
 		additionalLinkerInputs.Add(&label)
 		linkerFlags = append(linkerFlags, fmt.Sprintf("-Wl,--version-script,$(location %s)", label.Label))
+		axisFeatures = append(axisFeatures, "android_cfi_exports_map")
 	}
 
 	if props.Dynamic_list != nil {