Merge "Remove CFI diagnostics."

am: ebd8c69ac5 Change-Id: I95f13a0270783e0f2d4057c254380fe97f4e47ab
6 years ago · 9267f7a253
parent 357c3ce0f8 ebd8c69ac5
commit 9267f7a253
1 changed files with 0 additions and 1 deletions
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@ -191,7 +191,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= mediafilter

 LOCAL_SANITIZE := cfi
-LOCAL_SANITIZE_DIAG := cfi

 include $(BUILD_EXECUTABLE)