commit c774eb42a138ff5b0c8f7a8aabb70330b7307b25
author Vishwath Mohan <vishwath@google.com> Mon Feb 13 12:56:43 2017 -0800
committer Vishwath Mohan <vishwath@google.com> Mon Feb 13 12:56:43 2017 -0800
tree ea08ad2b5b00494b873f4392a96944d167259b37
parent 3514ed5cf9fe31b627c2eb139b03c599d7783fa7

Enable CFI for libFLAC.

Builds the libFLAC static library with CFI enabled. This ensure that
it interoperates well with shared libraries (like libstagefright.so)
that depend on this library, and which have CFI enabled.

Bug: 30227045
Test: m -j40 and device builds and boots
Test: CFI is not enabled unless built with ENABLE_CFI=true
Test: CFI enabled build passes the media CTS tests.
Change-Id: If6c3a6b3daa2b791ef10c97242bdd24532a0f3e7

libFLAC/Android.mk

diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 8c9d706..e6d1b0e 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -34,4 +34,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_SANITIZE := cfi
+LOCAL_SANITIZE_DIAG := cfi
+
 include $(BUILD_STATIC_LIBRARY)