commit 64d95bebcacafedfc6ff5534da9c70d34ef201e2
author Mitch Phillips <mitchp@google.com> Fri Nov 20 05:28:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 05:28:52 2020 +0000
tree ff119669f30b84f3c621aa0a0900d23f81db0ddc
parent 45dbd243ddf2fab9a0b6308ff5923b79d4444760
parent eb29c3587d99e26565bbdfd50263032b7088268f

[GWP-ASan] [Android-Specific] Integrate upstream build changes. am: fdfd07773c am: eb29c3587d

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

Change-Id: I77af5c66ceb64d1d4591ffafced8e4d849b42a3c

Android.bp

diff --git a/Android.bp b/Android.bp
index 261b190..5bc4fb2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,8 +79,8 @@
         "gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp",
         "gwp_asan/platform_specific/mutex_posix.cpp",
         "gwp_asan/platform_specific/utilities_posix.cpp",
-        "gwp_asan/random.cpp",
         "gwp_asan/stack_trace_compressor.cpp",
+        "gwp_asan/utilities.cpp"
     ],
     // GWP-ASan requires platform (non-emulated) TLS. We use thread local
     // variables in the core, inlined interface to GWP-ASan.