commit ba74d516e952fba28d3252d8b6eeca5e0de4f184
author Alix <agespino@google.com> Fri May 13 21:53:41 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 13 21:53:41 2022 +0000
tree 8687571b4be8c37cb8b0d38c77376739991dd37b
parent a7af87e5bf47a1b3ae2945c09f466d476d89a229
parent 898868785e4a96abe631995e62a1add3c642d3b0

Moved contents of clang_cflags into cflags am: 5cfa62ca29 am: 69aab83963 am: c62ec1000b am: 898868785e

Original change: https://android-review.googlesource.com/c/platform/system/gatekeeper/+/2069578

Change-Id: Ibe4b867c69e43b28f716bda9643af92eefbbf787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 340d4cf..790b4a5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,6 +33,7 @@
         "-Wall",
         "-Werror",
         "-g",
+        "-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp",
     ],
     header_libs: [
         "libhardware_headers",
@@ -40,10 +41,6 @@
 
     export_include_dirs: ["include"],
 
-    // TODO(krasin): reenable coverage flags, when the new Clang toolchain is released.
-    // Currently, if enabled, these flags will cause an internal error in Clang.
-    // Bug: 25119481
-    clang_cflags: ["-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp"],
 }
 
 // libgatekeeper_static is an empty static library that exports