commit eb3324081bf1062d152b45638bb1b3fed2b71546
author Vishwath Mohan <vishwath@google.com> Thu Apr 13 22:32:39 2017 -0700
committer Vishwath Mohan <vishwath@google.com> Mon Apr 17 18:20:16 2017 -0700
tree da2ce2878a306c99642de6d8263049d8281a7a04
parent 1ceb2df2b5b2a38c3bea2076b0a3ce51d2549307

Enable CFI for more components.

Enables CFI for libmediaplayerservice, and for the testid3 and
mediafilter executables.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots
Test: Media CTS tests pass, testid3 and mediafilter work correctly
Change-Id: If4cbca00157d5dd63c55a1379cfd83b926f56dbe

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 7af7031..b5159ed 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -65,6 +65,9 @@
 
 LOCAL_32_BIT_ONLY := true
 
+LOCAL_SANITIZE := cfi
+LOCAL_SANITIZE_DIAG := cfi
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))