From 7098557f8035503951a692d940960f1fe18e1cfe Mon Sep 17 00:00:00 2001 From: Taylor Holberton Date: Sat, 14 Jan 2017 10:50:47 -0800 Subject: added jni/Android.mk for Android NDK --- Android.mk | 65 ---------------------------------------------------------- jni/Android.mk | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 65 deletions(-) delete mode 100644 Android.mk create mode 100644 jni/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index d5a8305..0000000 --- a/Android.mk +++ /dev/null @@ -1,65 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= src/mixer.c src/pcm.c -LOCAL_MODULE := libtinyalsa -LOCAL_SHARED_LIBRARIES:= libcutils libutils -LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinyplay.c -LOCAL_MODULE := tinyplay -LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinywavinfo.c -LOCAL_MODULE := tinywavinfo -LOCAL_SHARED_LIBRARIES:= libcutils libutils libm -LOCAL_MODULE_TAGS := optional -include $(BUILD_EXECUTABLE) - -ifeq ($(HOST_OS), linux) -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinywavinfo.c -LOCAL_MODULE := tinywavinfo -LOCAL_STATIC_LIBRARIES:= libcutils libutils -LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_EXECUTABLE) -endif - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinycap.c -LOCAL_MODULE := tinycap -LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinymix.c -LOCAL_MODULE := tinymix -LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= external/tinyalsa/include -LOCAL_SRC_FILES:= utils/tinypcminfo.c -LOCAL_MODULE := tinypcminfo -LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/jni/Android.mk b/jni/Android.mk new file mode 100644 index 0000000..b983f3a --- /dev/null +++ b/jni/Android.mk @@ -0,0 +1,47 @@ +LOCAL_PATH := $(call my-dir) + +srcdir ?= $(LOCAL_PATH)/../src +incdir ?= $(LOCAL_PATH)/../include +utilsdir ?= $(LOCAL_PATH)/../utils + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES:= $(incdir) +LOCAL_SRC_FILES:= $(srcdir)/mixer.c $(srcdir)/pcm.c +LOCAL_MODULE := libtinyalsa +LOCAL_SHARED_LIBRARIES:= libcutils libutils +LOCAL_MODULE_TAGS := optional +LOCAL_PRELINK_MODULE := false +include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES:= $(incdir) +LOCAL_SRC_FILES:= $(utilsdir)/tinyplay.c +LOCAL_MODULE := tinyplay +LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa +LOCAL_MODULE_TAGS := optional +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES:= $(incdir) +LOCAL_SRC_FILES:= $(utilsdir)/tinycap.c +LOCAL_MODULE := tinycap +LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa +LOCAL_MODULE_TAGS := optional +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES:= $(incdir) +LOCAL_SRC_FILES:= $(utilsdir)/tinymix.c +LOCAL_MODULE := tinymix +LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa +LOCAL_MODULE_TAGS := optional +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES:= $(incdir) +LOCAL_SRC_FILES:= $(utilsdir)/tinypcminfo.c +LOCAL_MODULE := tinypcminfo +LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa +LOCAL_MODULE_TAGS := optional +include $(BUILD_EXECUTABLE) + -- cgit v1.2.3