commit a59e5958bc6d2d9403e3c8083e402efe857964b1
author Roland McGrath <mcgrathr@google.com> Fri Nov 20 04:50:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 04:50:31 2020 +0000
tree c3c68ab3d203aa6420b8e9bd8f66c2623a927d50
parent 2f9b00df0ab0330d9063b13200266aa3cd2fcad8
parent a9d446537a5163e60116349d8344fd6f4995ba01

[GWP-ASan] Respect GWP_ASAN_DEFAULT_ENABLED compile-time macro am: a9d446537a

Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/1506414

Change-Id: I2e245828631f6b87c62b3998df77ba4de0bf3e1a

gwp_asan/options.inc

diff --git a/gwp_asan/options.inc b/gwp_asan/options.inc
index c81e1f4..67dcfae 100644
--- a/gwp_asan/options.inc
+++ b/gwp_asan/options.inc
@@ -10,7 +10,18 @@
 #error "Define GWP_ASAN_OPTION prior to including this file!"
 #endif
 
-GWP_ASAN_OPTION(bool, Enabled, true, "Is GWP-ASan enabled? Defaults to true.")
+#ifndef GWP_ASAN_DEFAULT_ENABLED
+#define GWP_ASAN_DEFAULT_ENABLED true
+#endif
+
+#ifndef GWP_ASAN_STRINGIFY
+#define GWP_ASAN_STRINGIFY(S) GWP_ASAN_STRINGIFY_(S)
+#define GWP_ASAN_STRINGIFY_(S) #S
+#endif
+
+GWP_ASAN_OPTION(bool, Enabled, GWP_ASAN_DEFAULT_ENABLED,
+                "Is GWP-ASan enabled? Defaults to " GWP_ASAN_STRINGIFY(
+                    GWP_ASAN_DEFAULT_ENABLED) ".")
 
 GWP_ASAN_OPTION(
     bool, PerfectlyRightAlign, false,