diff --git a/logd/Android.bp b/logd/Android.bp
index c057ef07c..335a174f9 100644
--- a/logd/Android.bp
+++ b/logd/Android.bp
@@ -45,6 +45,9 @@ cc_defaults {
     lto: {
         thin: true,
     },
+    sanitize: {
+        cfi: true,
+    },
     cpp_std: "experimental",
 }
 
@@ -147,7 +150,9 @@ cc_defaults {
         "SerializedLogChunkTest.cpp",
         "SerializedFlushToStateTest.cpp",
     ],
-
+    sanitize: {
+        cfi: true,
+    },
     static_libs: [
         "libbase",
         "libcutils",