From 70299e9a8c93e08ae0bcb8e7322394622ad1dbf0 Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Mon, 26 Mar 2018 14:47:31 -0500 Subject: [PATCH] Move fuzzers to include fuzz engine in pathname, default to 64-bit Old: /data/nativetest64/fuzzers/ID3_fuzzer/ID3_fuzzer New: /data/nativetest64/fuzzers/libFuzzer/ID3_fuzzer This allows having both the honggfuzz and libFuzzer variants built and flashed at the same time. It also means we don't have to rely on 'strings' to determine which type a given fuzzer is. Test: SANITIZE_TARGET=address mmma vendor/google/tools/security/fuzzers/libFuzzer/sanitycheck_fuzzer \ && test -e $ANDROID_PRODUCT_OUT/data/nativetest64/fuzzers/libFuzzer/sanitycheck_fuzzer Change-Id: Ic0899fe8f471cc63d11d810e5fd16b6c6f621bc1 --- core/fuzz_test.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fuzz_test.mk b/core/fuzz_test.mk index 2cc2e2c6d..f3bf7147d 100644 --- a/core/fuzz_test.mk +++ b/core/fuzz_test.mk @@ -65,12 +65,12 @@ ifdef LOCAL_MODULE_PATH_64 $(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE)) endif -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(LOCAL_MODULE) -LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE) ifndef LOCAL_MULTILIB ifndef LOCAL_32_BIT_ONLY -LOCAL_MULTILIB := both +LOCAL_MULTILIB := 64 endif endif