Revert "Build system changes for CFI (Soong)"
This reverts commit d4b484b0707c2dbbe1e3ac096f953344aea2b1dc.
Rationale: second in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)
Bug: 30227045
Test: builds
Change-Id: I38ab5284c614d6ee68e7359219bd75c7d50131be
diff --git a/cc/cc.go b/cc/cc.go
index 02aaf19..cdbe43e 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -46,9 +46,6 @@
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()
@@ -440,7 +437,12 @@
}
func (ctx *moduleContextImpl) static() bool {
- return ctx.mod.static()
+ if static, ok := ctx.mod.linker.(interface {
+ static() bool
+ }); ok {
+ return static.static()
+ }
+ return false
}
func (ctx *moduleContextImpl) staticBinary() bool {
@@ -1279,15 +1281,6 @@
return android.Paths{}
}
-func (c *Module) static() bool {
- if static, ok := c.linker.(interface {
- static() bool
- }); ok {
- return static.static()
- }
- return false
-}
-
//
// Defaults
//