commit d5bd5437b0bd0723d8199c332e8766d0b6a9a460
author Kris Alder <kalder@google.com> Thu Mar 11 17:54:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 11 17:54:04 2021 +0000
tree bac47b165358fde266ff35a6a1963bad0c97b9ba
parent d9f1884aeb2ccdc877ff51b3313e644901784fd0
parent 5e8ee3102e7b6c239b135793cd49cc73234e78ad

Merge "enable fuzzing trusty targets automatically"

trusty/fuzz/Android.bp

diff --git a/trusty/fuzz/Android.bp b/trusty/fuzz/Android.bp
index d147767..5d0ff79 100644
--- a/trusty/fuzz/Android.bp
+++ b/trusty/fuzz/Android.bp
@@ -30,7 +30,6 @@
         "-Werror",
     ],
     fuzz_config: {
-        fuzz_on_haiku_device: false,
         fuzz_on_haiku_host: false,
     },
 }

trusty/fuzz/test/Android.bp

diff --git a/trusty/fuzz/test/Android.bp b/trusty/fuzz/test/Android.bp
index 7d74913..e0bca55 100644
--- a/trusty/fuzz/test/Android.bp
+++ b/trusty/fuzz/test/Android.bp
@@ -24,5 +24,8 @@
         "-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,
+    },
 }