From fd6d9022fe069f99a08dde66310eac2964bd118c Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Fri, 13 Sep 2019 17:39:49 -0700 Subject: [PATCH] Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict. Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated by the cc_fuzz target. Bug: 141026328 Test: m example_fuzzer, fuzz target should have adjacent corpus/dict files. Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c --- CleanSpec.mk | 7 +++++++ core/base_rules.mk | 2 +- core/clear_vars.mk | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 284ef394bd..ddee6546ea 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -666,6 +666,13 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/init.gsi.rc) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/config/) +# Move fuzz targets from /data/fuzz/* to /data/fuzz//* for device, and +# /fuzz/* to /fuzz//* on host. +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/fuzz/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/data/fuzz/*) +$(call add-clean-step, rm -rf $(HOST_OUT)/fuzz/*) +$(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/host/*/fuzz/*) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/base_rules.mk b/core/base_rules.mk index 3c973bb46a..65ec2f4b54 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -568,7 +568,7 @@ my_installed_test_data := # Source to relative dst file paths for reuse in LOCAL_COMPATIBILITY_SUITE. my_test_data_file_pairs := -ifneq ($(filter NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) +ifneq ($(strip $(filter NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) $(LOCAL_IS_FUZZ_TARGET)),) ifneq ($(strip $(LOCAL_TEST_DATA)),) ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 3cadcc2ae8..24cca5aa4b 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -122,6 +122,7 @@ LOCAL_INSTRUMENTATION_FOR:= LOCAL_INTERMEDIATE_SOURCE_DIR:= LOCAL_INTERMEDIATE_SOURCES:= LOCAL_INTERMEDIATE_TARGETS:= +LOCAL_IS_FUZZ_TARGET:= LOCAL_IS_HOST_MODULE:= LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:= LOCAL_JACK_CLASSPATH:=