rebase to version 4.5.2

abulmo · Sep 1, 2024 · 95190e2 · 95190e2
1 parent 0e5f16c
commit 95190e2
Show file tree

Hide file tree

Showing 75 changed files with 279 additions and 39,086 deletions.
diff --git a/src/Android.mk b/src/Android.mk
@@ -2,17 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := aEdax # should be renamed to lib..aEdax..so afterwords
 LOCAL_CFLAGS += -DUNICODE
-<<<<<<< HEAD
-<<<<<<< HEAD
 LOCAL_SRC_FILES := all.c board_sse.c.neon eval_sse.c.neon flip_neon_bitscan.c.neon android/cpu-features.c
 LOCAL_ARM_NEON := false
-=======
-LOCAL_SRC_FILES := all.c
-# LOCAL_ARM_NEON := true
->>>>>>> f2da03e (Refine arm builds adding neon support.)
-=======
-LOCAL_SRC_FILES := all.c board_sse.c.neon eval_sse.c.neon flip_neon_bitscan.c.neon android/cpu-features.c
-LOCAL_ARM_NEON := false
->>>>>>> 343493d (More neon/sse optimizations; neon dispatch added for arm32)
 # cmd-strip :=
 include $(BUILD_EXECUTABLE)