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

Commit 64a4a5f5 authored by Colin Cross's avatar Colin Cross
Browse files

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

cc/fuzz.go

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

		}

java/fuzz.go

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

		}