diff options
| author | 2017-02-07 17:44:45 +0000 | |
|---|---|---|
| committer | 2017-02-07 17:44:46 +0000 | |
| commit | 6dde4d32747eb80b67a4b2ab5d38e324dcbc7874 (patch) | |
| tree | 7215ae77b020aa8735f35e58a0a7191578f7ae8f | |
| parent | f8512f8515f7568984e1ca209929262ea88e4b59 (diff) | |
| parent | cd1ed41d0608bd5fec096a01030defb51e464faa (diff) | |
Merge "Revert to `-fstack-protector-strong` in read barrier config."
| -rw-r--r-- | build/art.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build/art.go b/build/art.go index baa6e59b55..e7f7e2121e 100644 --- a/build/art.go +++ b/build/art.go @@ -68,10 +68,6 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { asflags = append(asflags, "-DART_USE_READ_BARRIER=1", "-DART_READ_BARRIER_TYPE_IS_"+barrierType+"=1") - - // Temporarily override -fstack-protector-strong with -fstack-protector to avoid a major - // slowdown with the read barrier config. b/26744236. - cflags = append(cflags, "-fstack-protector") } if envTrue(ctx, "ART_USE_VIXL_ARM_BACKEND") { |