commit 14647abae6dcaa279f2addc125dfbd7126527fda
author Kris Alder <kalder@google.com> Thu Mar 11 18:11:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 18:11:20 2021 +0000
tree bac47b165358fde266ff35a6a1963bad0c97b9ba
parent 93e302bb191b0dabad8915b349f6f647925b7e74
parent d5bd5437b0bd0723d8199c332e8766d0b6a9a460

Merge "enable fuzzing trusty targets automatically" am: d5bd5437b0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1625099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0757c4d80abc3137e9eba5e2dd074f3d19c9605e

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,
+    },
 }