commit e1fd409fcb075fdfe96b11ffd7d579741902d56a
author Christopher Ferris <cferris@google.com> Mon Dec 16 16:22:55 2019 -0800
committer Christopher Ferris <cferris@google.com> Mon Dec 16 16:22:55 2019 -0800
tree 35b2d0912edaa83aa67ac744abf59fe542591d6a
parent 5761dd85b6efbc72449e2fe578486d189ccc9dec

Add support for scudo svelte.

Bug: 137795072

Test: Built with scudo and scudo svelte.
Change-Id: Ib2afd5249b897b818012ee71547af1f4ee60201b

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index ae5f39e..8dcc8f6 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -127,9 +127,18 @@
     name: "libc_scudo_defaults",
 
     cflags: [
-        "-DUSE_SCUDO",
+        "-DUSE_SCUDO_SVELTE",
     ],
 
+    product_variables: {
+        malloc_not_svelte: {
+            cflags: [
+                "-UUSE_SCUDO_SVELTE",
+                "-DUSE_SCUDO",
+            ],
+        },
+    },
+
     whole_static_libs: [
         "libscudo",
     ],