From 5e8ee3102e7b6c239b135793cd49cc73234e78ad Mon Sep 17 00:00:00 2001
From: Kris Alder <kalder@google.com>
Date: Tue, 9 Mar 2021 20:26:42 +0000
Subject: [PATCH] enable fuzzing trusty targets automatically

The non-test fuzz targets should run automatically in Haiku.

None of these should be built for Host, and all but the
trusty_test_fuzzer should be built for Target.

Test: built locally (make haiku) and checked that non-test trusty fuzz
targets are included as expected.

Change-Id: Ic67b1e1ddea8ed61b83deef66acdeb0891489195
---
 trusty/fuzz/Android.bp      | 1 -
 trusty/fuzz/test/Android.bp | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/trusty/fuzz/Android.bp b/trusty/fuzz/Android.bp
index d1477673a..5d0ff7920 100644
--- a/trusty/fuzz/Android.bp
+++ b/trusty/fuzz/Android.bp
@@ -30,7 +30,6 @@ cc_defaults {
         "-Werror",
     ],
     fuzz_config: {
-        fuzz_on_haiku_device: false,
         fuzz_on_haiku_host: false,
     },
 }
diff --git a/trusty/fuzz/test/Android.bp b/trusty/fuzz/test/Android.bp
index 7d7491392..e0bca55b1 100644
--- a/trusty/fuzz/test/Android.bp
+++ b/trusty/fuzz/test/Android.bp
@@ -24,5 +24,8 @@ cc_fuzz {
         "-DTRUSTY_APP_PORT=\"com.android.trusty.sancov.test.srv\"",
         "-DTRUSTY_APP_UUID=\"77f68803-c514-43ba-bdce-3254531c3d24\"",
         "-DTRUSTY_APP_FILENAME=\"srv.syms.elf\"",
-    ]
+    ],
+    fuzz_config: {
+        fuzz_on_haiku_device: false,
+    },
 }