From 4b0112209b02de1645f416e7d85c00d62eddaa9a Mon Sep 17 00:00:00 2001 From: Cory Barker Date: Fri, 3 Feb 2023 00:19:34 +0000 Subject: [PATCH] Build java fuzz targets with one build target instead of needed a host target and device (cherry picked from commit 12727fceab2990eb23a8014d2fc27b873ff3afb1) Test: built locally and verified fuzzers with Jazzer Change-Id: Icb1ecef1920fa1ba6d4492acdd3b37093964eb84 --- core/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/core/Makefile b/core/Makefile index 14adbb585c..ccfa3f2a76 100644 --- a/core/Makefile +++ b/core/Makefile @@ -7303,17 +7303,9 @@ 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)) $(call dist-for-goals,haiku,$(PRODUCT_OUT)/module-info.json) - -.PHONY: haiku-java-device -haiku-java-device: $(SOONG_JAVA_FUZZ_DEVICE_PACKAGING_ARCH_MODULES) $(ALL_JAVA_FUZZ_DEVICE_TARGETS) -$(call dist-for-goals,haiku-java-device,$(SOONG_JAVA_FUZZ_DEVICE_PACKAGING_ARCH_MODULES)) -$(call dist-for-goals,haiku-java-device,$(PRODUCT_OUT)/module-info.json) - -.PHONY: haiku-java-host -haiku-java-host: $(SOONG_JAVA_FUZZ_HOST_PACKAGING_ARCH_MODULES) $(ALL_JAVA_FUZZ_HOST_TARGETS) -$(call dist-for-goals,haiku-java-host,$(SOONG_JAVA_FUZZ_HOST_PACKAGING_ARCH_MODULES)) -$(call dist-for-goals,haiku-java-host,$(PRODUCT_OUT)/module-info.json) - +.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)) .PHONY: haiku-rust haiku-rust: $(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_RUST_FUZZ_TARGETS) $(call dist-for-goals,haiku-rust,$(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES))