diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2018-07-13 12:18:35 -0700 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2018-07-13 12:38:11 -0700 |
| commit | 95a684ff2494c2c72834d15d6589f590f06bb340 (patch) | |
| tree | e19f083c07db5dbf4bc2a8f0d9cf1bcdd76a2c61 /Android.bp | |
| parent | 4c593aae66caeacb59bfd5c37cb74c122b282d71 (diff) | |
| download | libvpx-95a684ff2494c2c72834d15d6589f590f06bb340.tar.gz | |
Don't explicitly enable CFI in libvpx.
Previously there was no other sanitization, so in order for the blacklist
to be picked up CFI had to be enabled. With integer_overflow enabled, we
no longer need it enabled explicitly in the build file. Since libvpx is
a static library, both CFI and non-CFI variants will be built and linked
accordingly.
If libvpx is used as a shared library in the future, we'll need to
explicitly re-enable CFI in the build file.
Bug: 63926619
Test: Library builds.
Change-Id: I6806eba2659cb047fc5e58de122f24d905bcd06c
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 04ddcb7a1..8122024e3 100644 --- a/Android.bp +++ b/Android.bp @@ -1609,10 +1609,10 @@ cc_library_static { sanitize: { integer_overflow: true, - cfi: true, + // Enable CFI if this becomes a shared library. + // cfi: true, diag: { integer_overflow: true, - cfi: true, }, blacklist: "libvpx_blacklist.txt", }, |