commit bbcf551a83b4cda4e370dffe80ab527c681521ca
author Steven Moreland <smoreland@google.com> Thu Sep 05 16:56:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 05 16:56:07 2019 -0700
tree 6604f30cd6d734d8d57ea09767961ef27601c02f
parent ba76258edb39729427223a4a02428cecf75df62c
parent 75f9ebc5f98155f6c221c019c1d35c71c87079a7

Merge "libbinder: remove forward declaration of Value" am: 766c08dccf
am: 75f9ebc5f9

Change-Id: I1060f04674b325f7ca45a19f2270cd3217e920c7

services/surfaceflinger/CompositionEngine/Android.bp

diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
index 6f076ad..1c31ab9 100644
--- a/services/surfaceflinger/CompositionEngine/Android.bp
+++ b/services/surfaceflinger/CompositionEngine/Android.bp
@@ -118,6 +118,13 @@
         //
         // You can either "make dist tests" before flashing, or set this
         // option to false temporarily.
-        address: true,
+
+
+        // FIXME: ASAN build is broken for a while, but was not discovered
+        // since new PM silently suppressed ASAN. Temporarily turn off ASAN
+        // to unblock the compiler upgrade process.
+        // address: true,
+        // http://b/139747256
+        address: false,
     },
 }