diff --git a/liblog/Android.bp b/liblog/Android.bp
index da475cb53d4e..6949e012836f 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -117,6 +117,11 @@ cc_library {
         "-DLIBLOG_LOG_TAG=1006",
         "-DSNET_EVENT_LOG_TAG=1397638484",
     ],
+    product_variables: {
+        debuggable: {
+            cflags: ["-DDEBUGGABLE"],
+        },
+    },
     logtags: ["event.logtags"],
     compile_multilib: "both",
 }
diff --git a/liblog/properties.cpp b/liblog/properties.cpp
index 2e0a8c9882fc..cc9f466a5952 100644
--- a/liblog/properties.cpp
+++ b/liblog/properties.cpp
@@ -275,6 +275,9 @@ int __android_log_is_loggable(int prio, const char* tag, int default_prio) {
 }
 
 int __android_log_is_debuggable() {
+#ifdef DEBUGGABLE
+  return 1;
+#else
   static uint32_t serial;
   static struct cache_char tag_cache;
   static const char key[] = "ro.debuggable";
@@ -302,6 +305,7 @@ int __android_log_is_debuggable() {
   }
 
   return ret;
+#endif
 }
 
 /*