p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Zach Riggle 2018-03-26 14:47:31 -05:00
parent 73570b2e5a
commit 70299e9a8c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/fuzz_test.mk
View File

@ -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