From 64a4a5f5cd5ecb245f814c1e4070bed97ad5ee48 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 16 May 2023 17:54:27 -0700 Subject: [PATCH] Separate host and host cross fuzz packaging Prevent collisions between host and host cross fuzz packaging when both are supported as fuzz targets by using a different value for hostOrTargetString. Test: builds with HOST_CROSS_OS := linux_musl Change-Id: I0e82bab2987899cece94c89eb8398d1733ebbd15 --- cc/fuzz.go | 4 +++- java/fuzz.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cc/fuzz.go b/cc/fuzz.go index dfefc11f2..0f709c94f 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -398,7 +398,9 @@ func (s *ccRustFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) } hostOrTargetString := "target" - if ccModule.Host() { + if ccModule.Target().HostCross { + hostOrTargetString = "host_cross" + } else if ccModule.Host() { hostOrTargetString = "host" } diff --git a/java/fuzz.go b/java/fuzz.go index 4aa6dbffd..e24594ab7 100644 --- a/java/fuzz.go +++ b/java/fuzz.go @@ -150,7 +150,9 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { } hostOrTargetString := "target" - if javaFuzzModule.Host() { + if javaFuzzModule.Target().HostCross { + hostOrTargetString = "host_cross" + } else if javaFuzzModule.Host() { hostOrTargetString = "host" }