summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Veit <claymore1298@gmail.com>2019-07-27 14:44:50 +0200
committerJulian Veit <claymore1298@gmail.com>2019-07-27 14:44:50 +0200
commit61360890216429beeb67adfd13c82fc823ffd1df (patch)
tree34a8291e2049d0434127e746d2c336d64a81e2f3
parenta6ef2dd6ccbe3ea12773088c8eb0e6763f657967 (diff)
JamesDSP: rename libsndfile to libsndfile_custom
-rw-r--r--app/jni/libsndfile/Android.mk4
-rw-r--r--app/jni/main/Android.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/jni/libsndfile/Android.mk b/app/jni/libsndfile/Android.mk
index ff2a718..91a60be 100644
--- a/app/jni/libsndfile/Android.mk
+++ b/app/jni/libsndfile/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := libsndfile
+LOCAL_MODULE := libsndfile_custom
C_FILE_LIST := $(call all-subdir-c-files) \
$(wildcard $(LOCAL_PATH)/G72x/*.c) \
$(wildcard $(LOCAL_PATH)/GSM610/*.c) \
@@ -9,4 +9,4 @@ LOCAL_SRC_FILES := $(C_FILE_LIST:$(LOCAL_PATH)/%=%)
LOCAL_STATIC_LIBRARIES = libFLAC
LOCAL_CPPFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DNDEBUG
LOCAL_CFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DNDEBUG
-include $(BUILD_STATIC_LIBRARY) \ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)
diff --git a/app/jni/main/Android.mk b/app/jni/main/Android.mk
index bb44632..9f5c575 100644
--- a/app/jni/main/Android.mk
+++ b/app/jni/main/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := jamesDSPImpulseToolbox
LOCAL_SRC_FILES := kissfft/kiss_fft.c kissfft/kiss_fftr.c JdspImpResToolbox.c AutoConvolver.c
-LOCAL_STATIC_LIBRARIES = libsndfile libsamplerate
+LOCAL_STATIC_LIBRARIES = libsndfile_custom libsamplerate
LOCAL_CPPFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DNDEBUG
LOCAL_CFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DNDEBUG -Wno-unused-variable -Wno-unused-parameter
LOCAL_LDFLAGS += -Wl,--gc-sections,--exclude-libs,ALL