diff options
author | Kris Alder <kalder@google.com> | 2020-03-17 00:47:16 +0000 |
---|---|---|
committer | Zhaoming Yin <zhaomingyin@google.com> | 2020-10-15 15:24:56 +0000 |
commit | 7541c8a3e958585308b82beff3eb8e5dde2c3432 (patch) | |
tree | 1a8fa2d68feac248470388459167ef2e15b32103 /nn | |
parent | c66a43962b10e3f175f7fea965c0f4a7cc54501a (diff) | |
download | ml-7541c8a3e958585308b82beff3eb8e5dde2c3432.tar.gz |
DO NOT MERGE ANYWHERE: temporarily remove libneuralnetworks_fuzzer from Haikuandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-release
'make haiku' is failing when this fuzzer is enabled due to b/151102177.
This disables the fuzz target from running automatically for now.
This also re-arranges some library sections in the build file to make
the 'bpfmt' presubmit happy.
Bug: 151238901
Bug: 170512504
Test: 'make haiku' and verify the fuzz target isn't built
Change-Id: I2e11bd04bb1be136f7b3b0cc1ac2f80ad08a0b03
Diffstat (limited to 'nn')
-rw-r--r-- | nn/runtime/test/Android.bp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp index 65d9de688..df0c588d9 100644 --- a/nn/runtime/test/Android.bp +++ b/nn/runtime/test/Android.bp @@ -193,28 +193,28 @@ cc_test { ], } -cc_fuzz { - name: "libneuralnetworks_fuzzer", - defaults: ["NeuralNetworksTest_default_libs"], - owner: "google", - fuzz_config: { - cc: ["butlermichael@google.com"], - }, - srcs: [ - "android_fuzzing/Converter.cpp", - "android_fuzzing/FuzzTest.cpp", - "android_fuzzing/StaticAssert.cpp", - ], - corpus: ["android_fuzzing/corpus/*"], - shared_libs: ["libprotobuf-cpp-full"], - static_libs: [ - "libneuralnetworks_common", - "libneuralnetworks_fuzzer_proto", - "libneuralnetworks_generated_test_harness", - "libneuralnetworks_static", - "libprotobuf-mutator", - ], -} +//cc_fuzz { +// name: "libneuralnetworks_fuzzer", +// defaults: [ +// "NeuralNetworksTest_default_libs", +// "libneuralnetworks_fuzzer_defaults", +// ], +// owner: "google", +// fuzz_config: { +// cc: ["butlermichael@google.com"], +// // Temporarily disabled due to b/151102177. +// fuzz_on_haiku_host: false, +// fuzz_on_haiku_device: false, +// }, +// srcs: [ +// "android_fuzzing/FuzzTest.cpp", +// ], +// static_libs: [ +// "libneuralnetworks_common", +// "libneuralnetworks_generated_test_harness", +// "libneuralnetworks_static", +// ], +//} // Temporarily disabled due to b/139889855. cc_test { |