commit c8ba70827f1765c123d963bf3d38f1d6d9586235
author Steven Moreland <smoreland@google.com> Tue Aug 27 11:56:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 11:56:00 2019 -0700
tree 26e9962d7f49427353dc4b7485926328d47d01c6
parent 516e4af7c995ffff646016068631ccbab656382e
parent e22a3e6158be9cb2df3279ec781282dcab15fea2

Merge "libbinder: document no_apex" am: 349b0eb838
am: e22a3e6158

Change-Id: I559ea39e915e9d53f41b1bdababaf605984a57c9

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,
     },
 }