final touches before 2.60
MODIFY
Makefile
Makefile
@@ -326,7 +326,6 @@ clean:
$(MAKE) -C qemu_mode/unsigaction clean
$(MAKE) -C qemu_mode/libcompcov clean
$(MAKE) -C src/third_party/libradamsa/ clean
- -test -e unicorn_mode/unicorn/Makefile && $(MAKE) -C unicorn_mode/unicorn clean
-rm -rf unicorn_mode/unicorn
distrib: all radamsa

MODIFY
docs/ChangeLog
docs/ChangeLog
@@ -23,7 +23,7 @@ Version ++2.59d (develop):
- added preeny's desock_dup ld_preload library as
./experimental/socket_fuzzing for network fuzzing
- added AFL_AS_FORCE_INSTRUMENT environment variable for afl-as - this is
- for retrorewrite project
+ for the retrorewrite project
- we now set QEMU_SET_ENV from AFL_PRELOAD when qemu_mode is used

MODIFY
llvm_mode/afl-clang-fast.c
llvm_mode/afl-clang-fast.c
@@ -49,7 +49,11 @@ static void find_obj(u8* argv0) {
if (afl_path) {
+#ifdef __ANDROID__
+ tmp = alloc_printf("%s/afl-llvm-rt.so", afl_path);
+#else
tmp = alloc_printf("%s/afl-llvm-rt.o", afl_path);
+#endif
if (!access(tmp, R_OK)) {
@@ -73,7 +77,11 @@ static void find_obj(u8* argv0) {
dir = ck_strdup(argv0);
*slash = '/';
+#ifdef __ANDROID__
+ tmp = alloc_printf("%s/afl-llvm-rt.so", afl_path);
+#else
tmp = alloc_printf("%s/afl-llvm-rt.o", dir);
+#endif
if (!access(tmp, R_OK)) {
@@ -88,8 +96,14 @@ static void find_obj(u8* argv0) {
}
+#ifdef __ANDROID__
+ if (!access(AFL_PATH "/afl-llvm-rt.so", R_OK)) {
+
+#else
if (!access(AFL_PATH "/afl-llvm-rt.o", R_OK)) {
+#endif
+
obj_path = AFL_PATH;
return;
@@ -358,7 +372,7 @@ static void edit_params(u32 argc, char** argv) {
}
- //#ifndef __ANDROID__ // not sure, we might need these ifdefs for Android
+#ifndef __ANDROID__
switch (bit_mode) {
case 0:
@@ -383,7 +397,7 @@ static void edit_params(u32 argc, char** argv) {
}
- //#endif
+#endif
}

final touches before 2.60