commit 9978b5274c67fe2f025de0fd9945f9b5942582ba
author Dan Austin <danielaustin@google.com> Wed Jun 28 15:26:38 2017 -0700
committer Dan Austin <danielaustin@google.com> Thu Jun 29 08:53:02 2017 -0700
tree 2b4251a740f24915585118bf9deec47bff90f426
parent 9ea6a8b817928462492c4f7e1f16f6ff3a314a03

Update coverage sanitizer flags in make

Update the coverage sanitizer flags in make to use the new
flavor of coverage sanitization.

Bug: 63108942

Test: Test fuzzer runs with coverage guards.

Change-Id: I12bda1767b69d0d89557e5f8a91da50b0f137ff3

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 04aedf4..967df2d 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -138,7 +138,7 @@
   ifeq ($(filter address,$(my_sanitize)),)
     $(error $(LOCAL_PATH): $(LOCAL_MODULE): Use of 'coverage' also requires 'address')
   endif
-  my_cflags += -fsanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp
+  my_cflags += -fsanitize-coverage=trace-pc-guard
   my_sanitize := $(filter-out coverage,$(my_sanitize))
 endif
 

core/host_fuzz_test.mk

diff --git a/core/host_fuzz_test.mk b/core/host_fuzz_test.mk
index 1c9eed2..8622911 100644
--- a/core/host_fuzz_test.mk
+++ b/core/host_fuzz_test.mk
@@ -4,7 +4,7 @@
 ################################################
 $(call record-module-type,HOST_FUZZ_TEST)
 
-LOCAL_CFLAGS += -fsanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp
+LOCAL_CFLAGS += -fsanitize-coverage=trace-pc-guard
 LOCAL_STATIC_LIBRARIES += libLLVMFuzzer
 
 include $(BUILD_HOST_EXECUTABLE)