aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishwath Mohan <vishwath@google.com>2017-02-13 12:56:43 -0800
committerVishwath Mohan <vishwath@google.com>2017-02-13 12:56:43 -0800
commitc774eb42a138ff5b0c8f7a8aabb70330b7307b25 (patch)
treeea08ad2b5b00494b873f4392a96944d167259b37
parent3514ed5cf9fe31b627c2eb139b03c599d7783fa7 (diff)
downloadflac-c774eb42a138ff5b0c8f7a8aabb70330b7307b25.tar.gz
Enable CFI for libFLAC.android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
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
-rw-r--r--libFLAC/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 8c9d706f..e6d1b0e3 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -34,4 +34,7 @@ LOCAL_MODULE := libFLAC
LOCAL_MODULE_TAGS := optional
+LOCAL_SANITIZE := cfi
+LOCAL_SANITIZE_DIAG := cfi
+
include $(BUILD_STATIC_LIBRARY)