diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 57a7993bd..729ef48d3 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -159,8 +159,8 @@ ifneq ($(filter cfi,$(my_sanitize)),)
   # LLVM is not set up to do this on a function basis, so force Thumb on the
   # entire module.
   LOCAL_ARM_MODE := thumb
-  my_cflags += -flto -fsanitize-cfi-cross-dso -fvisibility=default
-  my_ldflags += -flto -fsanitize-cfi-cross-dso -fsanitize=cfi -Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check
+  my_cflags += $(CFI_EXTRA_CFLAGS)
+  my_ldflags += $(CFI_EXTRA_LDFLAGS)
   my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
   # Workaround for b/33678192. CFI jumptables need Thumb2 codegen.  Revert when
   # Clang is updated past r290384.