From 71123ec1bc35a96b8c944f6f6150383c9ebd75fe Mon Sep 17 00:00:00 2001
From: Alex Light <allight@google.com>
Date: Wed, 24 Jul 2019 13:34:19 -0700
Subject: [PATCH] Disable linux_bionic fuzzers

fuzzers require linking to libclang_rt which does not support
linux_bionic. Therefore always disable this target.

Test: ./art/tools/build_linux_bionic_tests.sh
Bug: 138307504
Bug: 118058804
Change-Id: I12816f302d32d5ee846f90c62814744ae35c49bb
---
 cc/fuzz.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cc/fuzz.go b/cc/fuzz.go
index 3b0c5c83a..c1754b2da 100644
--- a/cc/fuzz.go
+++ b/cc/fuzz.go
@@ -105,15 +105,19 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module {
 
 	// The fuzzer runtime is not present for darwin host modules, disable cc_fuzz modules when targeting darwin.
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) {
-		disableDarwin := struct {
+		disableDarwinAndLinuxBionic := struct {
 			Target struct {
 				Darwin struct {
 					Enabled *bool
 				}
+				Linux_bionic struct {
+					Enabled *bool
+				}
 			}
 		}{}
-		disableDarwin.Target.Darwin.Enabled = BoolPtr(false)
-		ctx.AppendProperties(&disableDarwin)
+		disableDarwinAndLinuxBionic.Target.Darwin.Enabled = BoolPtr(false)
+		disableDarwinAndLinuxBionic.Target.Linux_bionic.Enabled = BoolPtr(false)
+		ctx.AppendProperties(&disableDarwinAndLinuxBionic)
 	})
 
 	return module