about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2021-03-26 09:03:51 +0100
committerGitHub <noreply@github.com>2021-03-26 09:03:51 +0100
commit96533f627e9ec5133502312211a7d677e256bfe7 (patch)
tree492858f07d42fdffb4628dd522a2dbe623e5cf1e /src
parent22c696ff1c64025398504e87f3112da82857d901 (diff)
parentc89264205779635ec43f2913a94fa3ae5e6a5186 (diff)
downloadafl++-96533f627e9ec5133502312211a7d677e256bfe7.tar.gz
Merge pull request #845 from joeyjiaojg/dev
Dev
Diffstat (limited to 'src')
-rw-r--r--src/afl-cc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 1b4edbb9..3f75c549 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -587,9 +587,9 @@ static void edit_params(u32 argc, char **argv, char **envp) {
       if (instrument_mode == INSTRUMENT_PCGUARD) {
 
 #if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0)
-  #ifdef __ANDROID__
+  #if defined __ANDROID__ || ANDROID
         cc_params[cc_par_cnt++] = "-fsanitize-coverage=trace-pc-guard";
-        instrument_mode != INSTRUMENT_LLVMNATIVE;
+        instrument_mode = INSTRUMENT_LLVMNATIVE;
   #else
         if (have_instr_list) {
 
@@ -1995,7 +1995,7 @@ int main(int argc, char **argv, char **envp) {
   if (!be_quiet && cmplog_mode)
     printf("CmpLog mode by <andreafioraldi@gmail.com>\n");
 
-#ifndef __ANDROID__
+#if !defined(__ANDROID__) && !defined(ANDROID)
   ptr = find_object("afl-compiler-rt.o", argv[0]);
 
   if (!ptr) {