From 9978b5274c67fe2f025de0fd9945f9b5942582ba Mon Sep 17 00:00:00 2001
From: Dan Austin <danielaustin@google.com>
Date: Wed, 28 Jun 2017 15:26:38 -0700
Subject: [PATCH] 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 | 2 +-
core/host_fuzz_test.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 04aedf401..967df2d9d 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -138,7 +138,7 @@ ifneq ($(filter coverage,$(my_sanitize)),)
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
diff --git a/core/host_fuzz_test.mk b/core/host_fuzz_test.mk
index 1c9eed2c7..86229113f 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)