From f3486b10201c7c5588846f5e7fa704ceabf962ce Mon Sep 17 00:00:00 2001 From: Cory Barker Date: Mon, 8 Aug 2022 15:55:12 +0000 Subject: [PATCH] Revert "Updated the way we build AFL++ fuzz binaries" Revert "Updated the way we build AFL++ fuzz binaries" Revert "Updated the way we build AFL++ fuzz binaries" Revert "Updated the way we build AFL++ fuzz binaries" Revert submission 2164482-Build AFL from Command line option Reason for revert: Unit test fails on MAC builds Reverted Changes: Ia7a822462:Updated the way we build AFL++ fuzz binaries I994bde63b:Updated the way we build AFL++ fuzz binaries Ie863853b4:Updated the way we build AFL++ fuzz binaries I577d6ae7b:Updated the way we build AFL++ fuzz binaries Ic4fd34f8d:Updated the way we build AFL++ fuzz binaries Change-Id: I33a39001d6387fc67bb1d7b5551762d2f145a68d --- core/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/Makefile b/core/Makefile index 63334afede..5727db21c0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6913,6 +6913,7 @@ endif # depended on by each module in soong_cc_prebuilt.mk, where the module will have # a dependency on each shared library that it needs to be "reinstalled". FUZZ_SHARED_DEPS := $(call copy-many-files,$(strip $(FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS))) +AFL_FUZZ_SHARED_DEPS := $(call copy-many-files,$(strip $(AFL_FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS))) # ----------------------------------------------------------------- # The rule to build all fuzz targets for C++ and Rust, and package them. @@ -6928,6 +6929,10 @@ FUZZ_SHARED_DEPS := $(call copy-many-files,$(strip $(FUZZ_TARGET_SHARED_DEPS_INS haiku: $(SOONG_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_FUZZ_TARGETS) $(call dist-for-goals,haiku,$(SOONG_FUZZ_PACKAGING_ARCH_MODULES)) +.PHONY: haiku-afl +haiku-afl: $(SOONG_AFL_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_AFL_FUZZ_TARGETS) +$(call dist-for-goals,haiku-afl,$(SOONG_AFL_FUZZ_PACKAGING_ARCH_MODULES)) + .PHONY: haiku-java haiku-java: $(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_JAVA_FUZZ_TARGETS) $(call dist-for-goals,haiku-java,$(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES))