StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate host and host cross fuzz packaging

Browse Source 
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
This commit is contained in:
Colin Cross
2023-05-16 17:54:27 -07:00
parent eaf7f5ecb9
commit 64a4a5f5cd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/fuzz.go
View File

@@ -398,7 +398,9 @@ func (s *ccRustFuzzPackager) GenerateBuildActions(ctx android.SingletonContext)
} }
hostOrTargetString := "target" hostOrTargetString := "target"
if ccModule.Host() { if ccModule.Target().HostCross {
hostOrTargetString = "host_cross"
} else if ccModule.Host() {
hostOrTargetString = "host" hostOrTargetString = "host"
} }

4
java/fuzz.go
View File

@@ -150,7 +150,9 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
} }
hostOrTargetString := "target" hostOrTargetString := "target"
if javaFuzzModule.Host() { if javaFuzzModule.Target().HostCross {
hostOrTargetString = "host_cross"
} else if javaFuzzModule.Host() {
hostOrTargetString = "host" hostOrTargetString = "host"
} }