diff options
| author | Julian Veit <claymore1298@gmail.com> | 2019-09-29 11:04:22 +0200 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2019-09-29 15:07:43 +0200 |
| commit | b60d17da98d714c17d8d0c2b64fec6ce6927c685 (patch) | |
| tree | f98e5943a433d8a20719dac747c19376bcb2ed70 | |
| parent | be03bb38aa3cdd202a395f47b62a32a8b3dacabd (diff) | |
JamesDSP: Switch to Android.bp
Change-Id: I4c4c169e68375037003855756058a7cd7d0195cc
| -rw-r--r-- | app/jni/libsamplerate/Android.bp | 7 | ||||
| -rw-r--r-- | app/jni/libsamplerate/Android.mk | 9 | ||||
| -rw-r--r-- | app/jni/libsndfile/Android.bp | 13 | ||||
| -rw-r--r-- | app/jni/libsndfile/Android.mk | 12 |
4 files changed, 20 insertions, 21 deletions
diff --git a/app/jni/libsamplerate/Android.bp b/app/jni/libsamplerate/Android.bp new file mode 100644 index 0000000..8ef9482 --- /dev/null +++ b/app/jni/libsamplerate/Android.bp @@ -0,0 +1,7 @@ +cc_library_static { + name: "libsamplerate", + srcs: [ + "*.c", + ], +} + diff --git a/app/jni/libsamplerate/Android.mk b/app/jni/libsamplerate/Android.mk deleted file mode 100644 index ae34b5f..0000000 --- a/app/jni/libsamplerate/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := libsamplerate -C_FILE_LIST := $(call all-subdir-c-files) \ - $(wildcard $(LOCAL_PATH)/*.c) -LOCAL_SRC_FILES := $(C_FILE_LIST:$(LOCAL_PATH)/%=%) -LOCAL_CPPFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DNDEBUG -LOCAL_CFLAGS += -ffunction-sections -fdata-sections -Ofast -ftree-vectorize -DHAVE_CONFIG_H -DFLAC__NO_MD5 -DNDEBUG -include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file diff --git a/app/jni/libsndfile/Android.bp b/app/jni/libsndfile/Android.bp new file mode 100644 index 0000000..061305e --- /dev/null +++ b/app/jni/libsndfile/Android.bp @@ -0,0 +1,13 @@ +cc_library_static { + name: "libsndfile_custom", + srcs: [ + "*.c", + "G72x/*.c", + "GSM610/*.c", + "ALAC/*.c", + ], + static_libs: [ + "libFLAC" + ], +} + diff --git a/app/jni/libsndfile/Android.mk b/app/jni/libsndfile/Android.mk deleted file mode 100644 index 91a60be..0000000 --- a/app/jni/libsndfile/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := libsndfile_custom -C_FILE_LIST := $(call all-subdir-c-files) \ - $(wildcard $(LOCAL_PATH)/G72x/*.c) \ - $(wildcard $(LOCAL_PATH)/GSM610/*.c) \ - $(wildcard $(LOCAL_PATH)/*.c) -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) |