Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6d9022 authored by Mitch Phillips's avatar Mitch Phillips
Browse files

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
parent 7ca2c153

CleanSpec.mk

+7 −0
Original line number Diff line number Diff line
@@ -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/<arch>/* for device, and

# /fuzz/* to /fuzz/<arch>/* 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

# ************************************************

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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:=