commit 848d47123f88c74dbc06314cd0fc215cfc7d44c6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 20:03:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 20:03:34 2020 +0000
tree 48db2d631fa18e0e0a853aae1d6dba7d00134ea9
parent c29a7449e7e6a197dcd46cefe16c164ebb5a8860
parent 9dc6b3343e79ca47144b4b6ea5db32ddcb2bb6fc

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 am: dd8b695c61 am: e9317d2d74 am: 9dc6b3343e

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

Change-Id: I5baaf7242bf3358862bf2c406af9aa6b9e49558b

Android.bp

diff --git a/Android.bp b/Android.bp
index a77e48a..593dd27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,6 +147,11 @@
         "model/VolumeBase.cpp",
         "model/VolumeEncryption.cpp",
     ],
+    product_variables: {
+        debuggable: {
+            cppflags: ["-D__ANDROID_DEBUGGABLE__"],
+        },
+    },
     shared_libs: [
         "android.hardware.health.storage@1.0",
     ],