Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586

Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a
diff --git a/Android.bp b/Android.bp
index 2c47859..039f60e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -146,6 +146,11 @@
         "model/VolumeBase.cpp",
         "model/VolumeEncryption.cpp",
     ],
+    product_variables: {
+        debuggable: {
+            cppflags: ["-D__ANDROID_DEBUGGABLE__"],
+        },
+    },
     shared_libs: [
         "android.hardware.health.storage@1.0",
     ],