diff options
| author | Orion Hodson <oth@google.com> | 2017-10-31 17:37:33 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-31 21:01:00 +0000 |
| commit | 33c252c2f14d61175a6b4e2c4d5b3461d53b0df8 (patch) | |
| tree | 8610a30df267392a33533b642f285b4a7d408a48 /cc/androidmk.go | |
| parent | da11d7422fe5c5e22bac03d7dff944f4ceba60a4 (diff) | |
| download | build_soong-33c252c2f14d61175a6b4e2c4d5b3461d53b0df8.tar.gz build_soong-33c252c2f14d61175a6b4e2c4d5b3461d53b0df8.tar.bz2 build_soong-33c252c2f14d61175a6b4e2c4d5b3461d53b0df8.zip | |
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
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index d028f8c7..194faaba 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -86,11 +86,6 @@ func (c *Module) AndroidMk() android.AndroidMkData { c.subAndroidMk(&ret, c.linker) if c.sanitize != nil { c.subAndroidMk(&ret, c.sanitize) - if Bool(c.sanitize.Properties.Sanitize.Cfi) { - ret.SubName += ".cfi" - } else if Bool(c.sanitize.Properties.Sanitize.Address) { - ret.SubName += ".asan" - } } c.subAndroidMk(&ret, c.installer) |