Revert "Revert "Build system changes for CFI (Soong)""
This reverts commit 33c252c2f14d61175a6b4e2c4d5b3461d53b0df8.
I have a fix to the crashes that this CL set was causing, and have
uploaded it as a patchset to this revert.
This also contains a partial fix that was initially submitted
separately as
https://android-review.googlesource.com/#/c/platform/build/soong/+/524295/
Bug: 30227045
Test: ./art/test/testrunner/run_build_test_target.py -j110 art-asan #no
build errors
Test: m -j50 ASAN_OPTIONS=detect_leaks=0 SANITIZE_HOST=address # no
build errors
Change-Id: I3e53549fa03413d35d9a952f04de1e7629e1f06d
diff --git a/cc/cc.go b/cc/cc.go
index cdbe43e..02aaf19 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -46,6 +46,9 @@
ctx.TopDown("asan_deps", sanitizerDepsMutator(asan))
ctx.BottomUp("asan", sanitizerMutator(asan)).Parallel()
+ ctx.TopDown("cfi_deps", sanitizerDepsMutator(cfi))
+ ctx.BottomUp("cfi", sanitizerMutator(cfi)).Parallel()
+
ctx.TopDown("tsan_deps", sanitizerDepsMutator(tsan))
ctx.BottomUp("tsan", sanitizerMutator(tsan)).Parallel()
@@ -437,12 +440,7 @@
}
func (ctx *moduleContextImpl) static() bool {
- if static, ok := ctx.mod.linker.(interface {
- static() bool
- }); ok {
- return static.static()
- }
- return false
+ return ctx.mod.static()
}
func (ctx *moduleContextImpl) staticBinary() bool {
@@ -1281,6 +1279,15 @@
return android.Paths{}
}
+func (c *Module) static() bool {
+ if static, ok := c.linker.(interface {
+ static() bool
+ }); ok {
+ return static.static()
+ }
+ return false
+}
+
//
// Defaults
//