| commit | 950e9d62b9714dba1728ba9d0ae736a73e4e6aca | [log] [tgz] |
|---|---|---|
| author | Alexandre Lision <alexandre.lision@savoirfairelinux.com> | Mon Dec 02 15:09:01 2013 -0500 |
| committer | Alexandre Lision <alexandre.lision@savoirfairelinux.com> | Mon Dec 02 15:09:01 2013 -0500 |
| tree | 5817481916d3cb90183f0cf7c2af34944194368d | |
| parent | 51140e199027569dc2776363794ee139e7a40824 [diff] |
* #36042: makefiles added, refactor on dependencies structures
diff --git a/jni/libsamplerate/Android.mk b/jni/libsamplerate/Android.mk index 8338432..3f2911e 100644 --- a/jni/libsamplerate/Android.mk +++ b/jni/libsamplerate/Android.mk
@@ -1,2 +1,27 @@ -include $(call all-subdir-makefiles) +include $(CLEAR_VARS) +MY_LIBSAMPLE := libsamplerate/sources + +# We need to build this for both the device (as a shared library) +# and the host (as a static library for tools to use). + +common_SRC_FILES := $(MY_LIBSAMPLE)/src/samplerate.c \ + $(MY_LIBSAMPLE)/src/src_sinc.c \ + $(MY_LIBSAMPLE)/src/src_zoh.c \ + $(MY_LIBSAMPLE)/src/src_linear.c + +# For the device +# ===================================================== + +# Device shared library +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(common_SRC_FILES) + +LOCAL_CFLAGS += -Werror -g + +LOCAL_C_INCLUDES += $(MY_LIBSAMPLE) + +LOCAL_MODULE:= libsamplerate + +include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/libsamplerate/AUTHORS b/jni/libsamplerate/sources/AUTHORS similarity index 100% rename from jni/libsamplerate/AUTHORS rename to jni/libsamplerate/sources/AUTHORS
diff --git a/jni/libsamplerate/COPYING b/jni/libsamplerate/sources/COPYING similarity index 100% rename from jni/libsamplerate/COPYING rename to jni/libsamplerate/sources/COPYING
diff --git a/jni/libsamplerate/Cfg/compile b/jni/libsamplerate/sources/Cfg/compile similarity index 100% rename from jni/libsamplerate/Cfg/compile rename to jni/libsamplerate/sources/Cfg/compile
diff --git a/jni/libsamplerate/Cfg/config.guess b/jni/libsamplerate/sources/Cfg/config.guess similarity index 100% rename from jni/libsamplerate/Cfg/config.guess rename to jni/libsamplerate/sources/Cfg/config.guess
diff --git a/jni/libsamplerate/Cfg/config.sub b/jni/libsamplerate/sources/Cfg/config.sub similarity index 100% rename from jni/libsamplerate/Cfg/config.sub rename to jni/libsamplerate/sources/Cfg/config.sub
diff --git a/jni/libsamplerate/Cfg/depcomp b/jni/libsamplerate/sources/Cfg/depcomp similarity index 100% rename from jni/libsamplerate/Cfg/depcomp rename to jni/libsamplerate/sources/Cfg/depcomp
diff --git a/jni/libsamplerate/Cfg/install-sh b/jni/libsamplerate/sources/Cfg/install-sh similarity index 100% rename from jni/libsamplerate/Cfg/install-sh rename to jni/libsamplerate/sources/Cfg/install-sh
diff --git a/jni/libsamplerate/Cfg/ltmain.sh b/jni/libsamplerate/sources/Cfg/ltmain.sh similarity index 100% rename from jni/libsamplerate/Cfg/ltmain.sh rename to jni/libsamplerate/sources/Cfg/ltmain.sh
diff --git a/jni/libsamplerate/Cfg/missing b/jni/libsamplerate/sources/Cfg/missing similarity index 100% rename from jni/libsamplerate/Cfg/missing rename to jni/libsamplerate/sources/Cfg/missing
diff --git a/jni/libsamplerate/ChangeLog b/jni/libsamplerate/sources/ChangeLog similarity index 100% rename from jni/libsamplerate/ChangeLog rename to jni/libsamplerate/sources/ChangeLog
diff --git a/jni/libsamplerate/INSTALL b/jni/libsamplerate/sources/INSTALL similarity index 100% rename from jni/libsamplerate/INSTALL rename to jni/libsamplerate/sources/INSTALL
diff --git a/jni/libsamplerate/M4/Makefile.am b/jni/libsamplerate/sources/M4/Makefile.am similarity index 100% rename from jni/libsamplerate/M4/Makefile.am rename to jni/libsamplerate/sources/M4/Makefile.am
diff --git a/jni/libsamplerate/M4/Makefile.in b/jni/libsamplerate/sources/M4/Makefile.in similarity index 100% rename from jni/libsamplerate/M4/Makefile.in rename to jni/libsamplerate/sources/M4/Makefile.in
diff --git a/jni/libsamplerate/M4/add_cflags.m4 b/jni/libsamplerate/sources/M4/add_cflags.m4 similarity index 100% rename from jni/libsamplerate/M4/add_cflags.m4 rename to jni/libsamplerate/sources/M4/add_cflags.m4
diff --git a/jni/libsamplerate/M4/check_signal.m4 b/jni/libsamplerate/sources/M4/check_signal.m4 similarity index 100% rename from jni/libsamplerate/M4/check_signal.m4 rename to jni/libsamplerate/sources/M4/check_signal.m4
diff --git a/jni/libsamplerate/M4/clip_mode.m4 b/jni/libsamplerate/sources/M4/clip_mode.m4 similarity index 100% rename from jni/libsamplerate/M4/clip_mode.m4 rename to jni/libsamplerate/sources/M4/clip_mode.m4
diff --git a/jni/libsamplerate/M4/endian.m4 b/jni/libsamplerate/sources/M4/endian.m4 similarity index 100% rename from jni/libsamplerate/M4/endian.m4 rename to jni/libsamplerate/sources/M4/endian.m4
diff --git a/jni/libsamplerate/M4/libtool.m4 b/jni/libsamplerate/sources/M4/libtool.m4 similarity index 100% rename from jni/libsamplerate/M4/libtool.m4 rename to jni/libsamplerate/sources/M4/libtool.m4
diff --git a/jni/libsamplerate/M4/lrint.m4 b/jni/libsamplerate/sources/M4/lrint.m4 similarity index 100% rename from jni/libsamplerate/M4/lrint.m4 rename to jni/libsamplerate/sources/M4/lrint.m4
diff --git a/jni/libsamplerate/M4/lrintf.m4 b/jni/libsamplerate/sources/M4/lrintf.m4 similarity index 100% rename from jni/libsamplerate/M4/lrintf.m4 rename to jni/libsamplerate/sources/M4/lrintf.m4
diff --git a/jni/libsamplerate/M4/ltoptions.m4 b/jni/libsamplerate/sources/M4/ltoptions.m4 similarity index 100% rename from jni/libsamplerate/M4/ltoptions.m4 rename to jni/libsamplerate/sources/M4/ltoptions.m4
diff --git a/jni/libsamplerate/M4/ltsugar.m4 b/jni/libsamplerate/sources/M4/ltsugar.m4 similarity index 100% rename from jni/libsamplerate/M4/ltsugar.m4 rename to jni/libsamplerate/sources/M4/ltsugar.m4
diff --git a/jni/libsamplerate/M4/ltversion.m4 b/jni/libsamplerate/sources/M4/ltversion.m4 similarity index 100% rename from jni/libsamplerate/M4/ltversion.m4 rename to jni/libsamplerate/sources/M4/ltversion.m4
diff --git a/jni/libsamplerate/M4/lt~obsolete.m4 b/jni/libsamplerate/sources/M4/lt~obsolete.m4 similarity index 100% rename from jni/libsamplerate/M4/lt~obsolete.m4 rename to jni/libsamplerate/sources/M4/lt~obsolete.m4
diff --git a/jni/libsamplerate/Make.bat b/jni/libsamplerate/sources/Make.bat similarity index 100% rename from jni/libsamplerate/Make.bat rename to jni/libsamplerate/sources/Make.bat
diff --git a/jni/libsamplerate/Makefile.am b/jni/libsamplerate/sources/Makefile.am similarity index 100% rename from jni/libsamplerate/Makefile.am rename to jni/libsamplerate/sources/Makefile.am
diff --git a/jni/libsamplerate/Makefile.in b/jni/libsamplerate/sources/Makefile.in similarity index 100% rename from jni/libsamplerate/Makefile.in rename to jni/libsamplerate/sources/Makefile.in
diff --git a/jni/libsamplerate/NEWS b/jni/libsamplerate/sources/NEWS similarity index 100% rename from jni/libsamplerate/NEWS rename to jni/libsamplerate/sources/NEWS
diff --git a/jni/libsamplerate/README b/jni/libsamplerate/sources/README similarity index 100% rename from jni/libsamplerate/README rename to jni/libsamplerate/sources/README
diff --git a/jni/libsamplerate/Win32/Makefile.am b/jni/libsamplerate/sources/Win32/Makefile.am similarity index 100% rename from jni/libsamplerate/Win32/Makefile.am rename to jni/libsamplerate/sources/Win32/Makefile.am
diff --git a/jni/libsamplerate/Win32/Makefile.in b/jni/libsamplerate/sources/Win32/Makefile.in similarity index 100% rename from jni/libsamplerate/Win32/Makefile.in rename to jni/libsamplerate/sources/Win32/Makefile.in
diff --git a/jni/libsamplerate/Win32/Makefile.mingw.in b/jni/libsamplerate/sources/Win32/Makefile.mingw.in similarity index 100% rename from jni/libsamplerate/Win32/Makefile.mingw.in rename to jni/libsamplerate/sources/Win32/Makefile.mingw.in
diff --git a/jni/libsamplerate/Win32/Makefile.msvc b/jni/libsamplerate/sources/Win32/Makefile.msvc similarity index 100% rename from jni/libsamplerate/Win32/Makefile.msvc rename to jni/libsamplerate/sources/Win32/Makefile.msvc
diff --git a/jni/libsamplerate/Win32/config.h b/jni/libsamplerate/sources/Win32/config.h similarity index 100% rename from jni/libsamplerate/Win32/config.h rename to jni/libsamplerate/sources/Win32/config.h
diff --git a/jni/libsamplerate/Win32/libsamplerate-0.def b/jni/libsamplerate/sources/Win32/libsamplerate-0.def similarity index 100% rename from jni/libsamplerate/Win32/libsamplerate-0.def rename to jni/libsamplerate/sources/Win32/libsamplerate-0.def
diff --git a/jni/libsamplerate/Win32/unistd.h b/jni/libsamplerate/sources/Win32/unistd.h similarity index 100% rename from jni/libsamplerate/Win32/unistd.h rename to jni/libsamplerate/sources/Win32/unistd.h
diff --git a/jni/libsamplerate/aclocal.m4 b/jni/libsamplerate/sources/aclocal.m4 similarity index 100% rename from jni/libsamplerate/aclocal.m4 rename to jni/libsamplerate/sources/aclocal.m4
diff --git a/jni/libsamplerate/autogen.sh b/jni/libsamplerate/sources/autogen.sh similarity index 100% rename from jni/libsamplerate/autogen.sh rename to jni/libsamplerate/sources/autogen.sh
diff --git a/jni/libsamplerate/autom4te.cache/output.0 b/jni/libsamplerate/sources/autom4te.cache/output.0 similarity index 100% rename from jni/libsamplerate/autom4te.cache/output.0 rename to jni/libsamplerate/sources/autom4te.cache/output.0
diff --git a/jni/libsamplerate/autom4te.cache/output.1 b/jni/libsamplerate/sources/autom4te.cache/output.1 similarity index 100% rename from jni/libsamplerate/autom4te.cache/output.1 rename to jni/libsamplerate/sources/autom4te.cache/output.1
diff --git a/jni/libsamplerate/autom4te.cache/requests b/jni/libsamplerate/sources/autom4te.cache/requests similarity index 100% rename from jni/libsamplerate/autom4te.cache/requests rename to jni/libsamplerate/sources/autom4te.cache/requests
diff --git a/jni/libsamplerate/autom4te.cache/traces.0 b/jni/libsamplerate/sources/autom4te.cache/traces.0 similarity index 100% rename from jni/libsamplerate/autom4te.cache/traces.0 rename to jni/libsamplerate/sources/autom4te.cache/traces.0
diff --git a/jni/libsamplerate/autom4te.cache/traces.1 b/jni/libsamplerate/sources/autom4te.cache/traces.1 similarity index 100% rename from jni/libsamplerate/autom4te.cache/traces.1 rename to jni/libsamplerate/sources/autom4te.cache/traces.1
diff --git a/jni/libsamplerate/config.h b/jni/libsamplerate/sources/config.h similarity index 100% rename from jni/libsamplerate/config.h rename to jni/libsamplerate/sources/config.h
diff --git a/jni/libsamplerate/config.log b/jni/libsamplerate/sources/config.log similarity index 100% rename from jni/libsamplerate/config.log rename to jni/libsamplerate/sources/config.log
diff --git a/jni/libsamplerate/configure b/jni/libsamplerate/sources/configure similarity index 100% rename from jni/libsamplerate/configure rename to jni/libsamplerate/sources/configure
diff --git a/jni/libsamplerate/configure.ac b/jni/libsamplerate/sources/configure.ac similarity index 100% rename from jni/libsamplerate/configure.ac rename to jni/libsamplerate/sources/configure.ac
diff --git a/jni/libsamplerate/doc/ChangeLog b/jni/libsamplerate/sources/doc/ChangeLog similarity index 100% rename from jni/libsamplerate/doc/ChangeLog rename to jni/libsamplerate/sources/doc/ChangeLog
diff --git a/jni/libsamplerate/doc/Makefile.am b/jni/libsamplerate/sources/doc/Makefile.am similarity index 100% rename from jni/libsamplerate/doc/Makefile.am rename to jni/libsamplerate/sources/doc/Makefile.am
diff --git a/jni/libsamplerate/doc/Makefile.in b/jni/libsamplerate/sources/doc/Makefile.in similarity index 100% rename from jni/libsamplerate/doc/Makefile.in rename to jni/libsamplerate/sources/doc/Makefile.in
diff --git a/jni/libsamplerate/doc/NEWS b/jni/libsamplerate/sources/doc/NEWS similarity index 100% rename from jni/libsamplerate/doc/NEWS rename to jni/libsamplerate/sources/doc/NEWS
diff --git a/jni/libsamplerate/doc/SRC.css b/jni/libsamplerate/sources/doc/SRC.css similarity index 100% rename from jni/libsamplerate/doc/SRC.css rename to jni/libsamplerate/sources/doc/SRC.css
diff --git a/jni/libsamplerate/doc/SRC.png b/jni/libsamplerate/sources/doc/SRC.png similarity index 100% rename from jni/libsamplerate/doc/SRC.png rename to jni/libsamplerate/sources/doc/SRC.png Binary files differ
diff --git a/jni/libsamplerate/doc/api.html b/jni/libsamplerate/sources/doc/api.html similarity index 100% rename from jni/libsamplerate/doc/api.html rename to jni/libsamplerate/sources/doc/api.html
diff --git a/jni/libsamplerate/doc/api_callback.html b/jni/libsamplerate/sources/doc/api_callback.html similarity index 100% rename from jni/libsamplerate/doc/api_callback.html rename to jni/libsamplerate/sources/doc/api_callback.html
diff --git a/jni/libsamplerate/doc/api_full.html b/jni/libsamplerate/sources/doc/api_full.html similarity index 100% rename from jni/libsamplerate/doc/api_full.html rename to jni/libsamplerate/sources/doc/api_full.html
diff --git a/jni/libsamplerate/doc/api_misc.html b/jni/libsamplerate/sources/doc/api_misc.html similarity index 100% rename from jni/libsamplerate/doc/api_misc.html rename to jni/libsamplerate/sources/doc/api_misc.html
diff --git a/jni/libsamplerate/doc/api_simple.html b/jni/libsamplerate/sources/doc/api_simple.html similarity index 100% rename from jni/libsamplerate/doc/api_simple.html rename to jni/libsamplerate/sources/doc/api_simple.html
diff --git a/jni/libsamplerate/doc/download.html b/jni/libsamplerate/sources/doc/download.html similarity index 100% rename from jni/libsamplerate/doc/download.html rename to jni/libsamplerate/sources/doc/download.html
diff --git a/jni/libsamplerate/doc/faq.html b/jni/libsamplerate/sources/doc/faq.html similarity index 100% rename from jni/libsamplerate/doc/faq.html rename to jni/libsamplerate/sources/doc/faq.html
diff --git a/jni/libsamplerate/doc/history.html b/jni/libsamplerate/sources/doc/history.html similarity index 100% rename from jni/libsamplerate/doc/history.html rename to jni/libsamplerate/sources/doc/history.html
diff --git a/jni/libsamplerate/doc/index.html b/jni/libsamplerate/sources/doc/index.html similarity index 100% rename from jni/libsamplerate/doc/index.html rename to jni/libsamplerate/sources/doc/index.html
diff --git a/jni/libsamplerate/doc/license.html b/jni/libsamplerate/sources/doc/license.html similarity index 100% rename from jni/libsamplerate/doc/license.html rename to jni/libsamplerate/sources/doc/license.html
diff --git a/jni/libsamplerate/doc/lists.html b/jni/libsamplerate/sources/doc/lists.html similarity index 100% rename from jni/libsamplerate/doc/lists.html rename to jni/libsamplerate/sources/doc/lists.html
diff --git a/jni/libsamplerate/doc/quality.html b/jni/libsamplerate/sources/doc/quality.html similarity index 100% rename from jni/libsamplerate/doc/quality.html rename to jni/libsamplerate/sources/doc/quality.html
diff --git a/jni/libsamplerate/doc/win32.html b/jni/libsamplerate/sources/doc/win32.html similarity index 100% rename from jni/libsamplerate/doc/win32.html rename to jni/libsamplerate/sources/doc/win32.html
diff --git a/jni/libsamplerate/examples/Makefile.am b/jni/libsamplerate/sources/examples/Makefile.am similarity index 100% rename from jni/libsamplerate/examples/Makefile.am rename to jni/libsamplerate/sources/examples/Makefile.am
diff --git a/jni/libsamplerate/examples/Makefile.in b/jni/libsamplerate/sources/examples/Makefile.in similarity index 100% rename from jni/libsamplerate/examples/Makefile.in rename to jni/libsamplerate/sources/examples/Makefile.in
diff --git a/jni/libsamplerate/examples/audio_out.c b/jni/libsamplerate/sources/examples/audio_out.c similarity index 100% rename from jni/libsamplerate/examples/audio_out.c rename to jni/libsamplerate/sources/examples/audio_out.c
diff --git a/jni/libsamplerate/examples/audio_out.h b/jni/libsamplerate/sources/examples/audio_out.h similarity index 100% rename from jni/libsamplerate/examples/audio_out.h rename to jni/libsamplerate/sources/examples/audio_out.h
diff --git a/jni/libsamplerate/examples/sndfile-resample.c b/jni/libsamplerate/sources/examples/sndfile-resample.c similarity index 100% rename from jni/libsamplerate/examples/sndfile-resample.c rename to jni/libsamplerate/sources/examples/sndfile-resample.c
diff --git a/jni/libsamplerate/examples/timewarp-file.c b/jni/libsamplerate/sources/examples/timewarp-file.c similarity index 100% rename from jni/libsamplerate/examples/timewarp-file.c rename to jni/libsamplerate/sources/examples/timewarp-file.c
diff --git a/jni/libsamplerate/examples/varispeed-play.c b/jni/libsamplerate/sources/examples/varispeed-play.c similarity index 100% rename from jni/libsamplerate/examples/varispeed-play.c rename to jni/libsamplerate/sources/examples/varispeed-play.c
diff --git a/jni/libsamplerate/libsamplerate.spec.in b/jni/libsamplerate/sources/libsamplerate.spec.in similarity index 100% rename from jni/libsamplerate/libsamplerate.spec.in rename to jni/libsamplerate/sources/libsamplerate.spec.in
diff --git a/jni/libsamplerate/samplerate.pc.in b/jni/libsamplerate/sources/samplerate.pc.in similarity index 100% rename from jni/libsamplerate/samplerate.pc.in rename to jni/libsamplerate/sources/samplerate.pc.in
diff --git a/jni/libsamplerate/src/Makefile.am b/jni/libsamplerate/sources/src/Makefile.am similarity index 100% rename from jni/libsamplerate/src/Makefile.am rename to jni/libsamplerate/sources/src/Makefile.am
diff --git a/jni/libsamplerate/src/Makefile.in b/jni/libsamplerate/sources/src/Makefile.in similarity index 100% rename from jni/libsamplerate/src/Makefile.in rename to jni/libsamplerate/sources/src/Makefile.in
diff --git a/jni/libsamplerate/src/Version_script.in b/jni/libsamplerate/sources/src/Version_script.in similarity index 100% rename from jni/libsamplerate/src/Version_script.in rename to jni/libsamplerate/sources/src/Version_script.in
diff --git a/jni/libsamplerate/src/check_asm.sh b/jni/libsamplerate/sources/src/check_asm.sh similarity index 100% rename from jni/libsamplerate/src/check_asm.sh rename to jni/libsamplerate/sources/src/check_asm.sh
diff --git a/jni/libsamplerate/src/common.h b/jni/libsamplerate/sources/src/common.h similarity index 100% rename from jni/libsamplerate/src/common.h rename to jni/libsamplerate/sources/src/common.h
diff --git a/jni/libsamplerate/src/config.h.in b/jni/libsamplerate/sources/src/config.h.in similarity index 100% rename from jni/libsamplerate/src/config.h.in rename to jni/libsamplerate/sources/src/config.h.in
diff --git a/jni/libsamplerate/src/fastest_coeffs.h b/jni/libsamplerate/sources/src/fastest_coeffs.h similarity index 100% rename from jni/libsamplerate/src/fastest_coeffs.h rename to jni/libsamplerate/sources/src/fastest_coeffs.h
diff --git a/jni/libsamplerate/src/float_cast.h b/jni/libsamplerate/sources/src/float_cast.h similarity index 100% rename from jni/libsamplerate/src/float_cast.h rename to jni/libsamplerate/sources/src/float_cast.h
diff --git a/jni/libsamplerate/src/high_qual_coeffs.h b/jni/libsamplerate/sources/src/high_qual_coeffs.h similarity index 100% rename from jni/libsamplerate/src/high_qual_coeffs.h rename to jni/libsamplerate/sources/src/high_qual_coeffs.h
diff --git a/jni/libsamplerate/src/mid_qual_coeffs.h b/jni/libsamplerate/sources/src/mid_qual_coeffs.h similarity index 100% rename from jni/libsamplerate/src/mid_qual_coeffs.h rename to jni/libsamplerate/sources/src/mid_qual_coeffs.h
diff --git a/jni/libsamplerate/src/samplerate.c b/jni/libsamplerate/sources/src/samplerate.c similarity index 100% rename from jni/libsamplerate/src/samplerate.c rename to jni/libsamplerate/sources/src/samplerate.c
diff --git a/jni/libsamplerate/src/samplerate.h b/jni/libsamplerate/sources/src/samplerate.h similarity index 100% rename from jni/libsamplerate/src/samplerate.h rename to jni/libsamplerate/sources/src/samplerate.h
diff --git a/jni/libsamplerate/src/src_linear.c b/jni/libsamplerate/sources/src/src_linear.c similarity index 100% rename from jni/libsamplerate/src/src_linear.c rename to jni/libsamplerate/sources/src/src_linear.c
diff --git a/jni/libsamplerate/src/src_sinc.c b/jni/libsamplerate/sources/src/src_sinc.c similarity index 100% rename from jni/libsamplerate/src/src_sinc.c rename to jni/libsamplerate/sources/src/src_sinc.c
diff --git a/jni/libsamplerate/src/src_zoh.c b/jni/libsamplerate/sources/src/src_zoh.c similarity index 100% rename from jni/libsamplerate/src/src_zoh.c rename to jni/libsamplerate/sources/src/src_zoh.c
diff --git a/jni/libsamplerate/tests/Makefile.am b/jni/libsamplerate/sources/tests/Makefile.am similarity index 100% rename from jni/libsamplerate/tests/Makefile.am rename to jni/libsamplerate/sources/tests/Makefile.am
diff --git a/jni/libsamplerate/tests/Makefile.in b/jni/libsamplerate/sources/tests/Makefile.in similarity index 100% rename from jni/libsamplerate/tests/Makefile.in rename to jni/libsamplerate/sources/tests/Makefile.in
diff --git a/jni/libsamplerate/tests/calc_snr.c b/jni/libsamplerate/sources/tests/calc_snr.c similarity index 100% rename from jni/libsamplerate/tests/calc_snr.c rename to jni/libsamplerate/sources/tests/calc_snr.c
diff --git a/jni/libsamplerate/tests/callback_hang_test.c b/jni/libsamplerate/sources/tests/callback_hang_test.c similarity index 100% rename from jni/libsamplerate/tests/callback_hang_test.c rename to jni/libsamplerate/sources/tests/callback_hang_test.c
diff --git a/jni/libsamplerate/tests/callback_test.c b/jni/libsamplerate/sources/tests/callback_test.c similarity index 100% rename from jni/libsamplerate/tests/callback_test.c rename to jni/libsamplerate/sources/tests/callback_test.c
diff --git a/jni/libsamplerate/tests/downsample_test.c b/jni/libsamplerate/sources/tests/downsample_test.c similarity index 100% rename from jni/libsamplerate/tests/downsample_test.c rename to jni/libsamplerate/sources/tests/downsample_test.c
diff --git a/jni/libsamplerate/tests/float_short_test.c b/jni/libsamplerate/sources/tests/float_short_test.c similarity index 100% rename from jni/libsamplerate/tests/float_short_test.c rename to jni/libsamplerate/sources/tests/float_short_test.c
diff --git a/jni/libsamplerate/tests/misc_test.c b/jni/libsamplerate/sources/tests/misc_test.c similarity index 100% rename from jni/libsamplerate/tests/misc_test.c rename to jni/libsamplerate/sources/tests/misc_test.c
diff --git a/jni/libsamplerate/tests/multi_channel_test.c b/jni/libsamplerate/sources/tests/multi_channel_test.c similarity index 100% rename from jni/libsamplerate/tests/multi_channel_test.c rename to jni/libsamplerate/sources/tests/multi_channel_test.c
diff --git a/jni/libsamplerate/tests/multichan_throughput_test.c b/jni/libsamplerate/sources/tests/multichan_throughput_test.c similarity index 100% rename from jni/libsamplerate/tests/multichan_throughput_test.c rename to jni/libsamplerate/sources/tests/multichan_throughput_test.c
diff --git a/jni/libsamplerate/tests/reset_test.c b/jni/libsamplerate/sources/tests/reset_test.c similarity index 100% rename from jni/libsamplerate/tests/reset_test.c rename to jni/libsamplerate/sources/tests/reset_test.c
diff --git a/jni/libsamplerate/tests/simple_test.c b/jni/libsamplerate/sources/tests/simple_test.c similarity index 100% rename from jni/libsamplerate/tests/simple_test.c rename to jni/libsamplerate/sources/tests/simple_test.c
diff --git a/jni/libsamplerate/tests/snr_bw_test.c b/jni/libsamplerate/sources/tests/snr_bw_test.c similarity index 100% rename from jni/libsamplerate/tests/snr_bw_test.c rename to jni/libsamplerate/sources/tests/snr_bw_test.c
diff --git a/jni/libsamplerate/tests/src-evaluate.c b/jni/libsamplerate/sources/tests/src-evaluate.c similarity index 100% rename from jni/libsamplerate/tests/src-evaluate.c rename to jni/libsamplerate/sources/tests/src-evaluate.c
diff --git a/jni/libsamplerate/tests/termination_test.c b/jni/libsamplerate/sources/tests/termination_test.c similarity index 100% rename from jni/libsamplerate/tests/termination_test.c rename to jni/libsamplerate/sources/tests/termination_test.c
diff --git a/jni/libsamplerate/tests/throughput_test.c b/jni/libsamplerate/sources/tests/throughput_test.c similarity index 100% rename from jni/libsamplerate/tests/throughput_test.c rename to jni/libsamplerate/sources/tests/throughput_test.c
diff --git a/jni/libsamplerate/tests/util.c b/jni/libsamplerate/sources/tests/util.c similarity index 100% rename from jni/libsamplerate/tests/util.c rename to jni/libsamplerate/sources/tests/util.c
diff --git a/jni/libsamplerate/tests/util.h b/jni/libsamplerate/sources/tests/util.h similarity index 100% rename from jni/libsamplerate/tests/util.h rename to jni/libsamplerate/sources/tests/util.h
diff --git a/jni/libsamplerate/tests/varispeed_test.c b/jni/libsamplerate/sources/tests/varispeed_test.c similarity index 100% rename from jni/libsamplerate/tests/varispeed_test.c rename to jni/libsamplerate/sources/tests/varispeed_test.c
diff --git a/jni/libsamplerate/src/Android.mk b/jni/libsamplerate/src/Android.mk deleted file mode 100644 index afa8acc..0000000 --- a/jni/libsamplerate/src/Android.mk +++ /dev/null
@@ -1,24 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# We need to build this for both the device (as a shared library) -# and the host (as a static library for tools to use). - -common_SRC_FILES := samplerate.c \ - src_sinc.c \ - src_zoh.c \ - src_linear.c - -# For the device -# ===================================================== - -# Device shared library -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += -Werror -g -LOCAL_LDFLAGS := -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. - -LOCAL_MODULE:= libsamplerate - -include $(BUILD_SHARED_LIBRARY)
