Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing

Test: make m
Bug: 64903541
Change-Id: Ibb7eb126b6e68c03d0336606ec540a62a8e903d4
This commit is contained in:
Zach Riggle 2017-08-21 17:07:42 -04:00
parent 0d35b9fba3
commit be0811f46c
3 changed files with 3 additions and 3 deletions

View File

@ -175,7 +175,7 @@ ifneq ($(filter coverage,$(my_sanitize)),)
ifeq ($(filter address,$(my_sanitize)),) ifeq ($(filter address,$(my_sanitize)),)
$(error $(LOCAL_PATH): $(LOCAL_MODULE): Use of 'coverage' also requires 'address') $(error $(LOCAL_PATH): $(LOCAL_MODULE): Use of 'coverage' also requires 'address')
endif endif
my_cflags += -fsanitize-coverage=trace-pc-guard my_cflags += -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp
my_sanitize := $(filter-out coverage,$(my_sanitize)) my_sanitize := $(filter-out coverage,$(my_sanitize))
endif endif

View File

@ -8,7 +8,7 @@ ifdef LOCAL_SDK_VERSION
$(error $(LOCAL_PATH): $(LOCAL_MODULE): NDK fuzz tests are not supported.) $(error $(LOCAL_PATH): $(LOCAL_MODULE): NDK fuzz tests are not supported.)
endif endif
LOCAL_CFLAGS += -fsanitize-coverage=trace-pc-guard LOCAL_CFLAGS += -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp
LOCAL_STATIC_LIBRARIES += libFuzzer LOCAL_STATIC_LIBRARIES += libFuzzer
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH

View File

@ -4,7 +4,7 @@
################################################ ################################################
$(call record-module-type,HOST_FUZZ_TEST) $(call record-module-type,HOST_FUZZ_TEST)
LOCAL_CFLAGS += -fsanitize-coverage=trace-pc-guard LOCAL_CFLAGS += -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp
LOCAL_STATIC_LIBRARIES += libLLVMFuzzer LOCAL_STATIC_LIBRARIES += libLLVMFuzzer
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)