commit dd8b695c61c7630627d2ca60c8e21b12180a5ac4
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 19:02:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 19:02:45 2020 +0000
tree fbd987659af7205761d9d54c1a3a8b63bbcee94f
parent d0b2751e8f5a57d2d065f936509273c084a28f57
parent bb92ff6591b450d35e6fe95eed60077288ceceff

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

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

Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627

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",
     ],