From cdcc350bf9662030a84d9ae4b18f31e8340c5df0 Mon Sep 17 00:00:00 2001 From: Richard Fitzgerald Date: Thu, 19 Oct 2017 15:02:17 +0100 Subject: Replace old style Android.mk with new Android.bp Create a new Android.bp file used by Android Oreo. There are dependencies on tinyalsa from other components in Oreo that use the new build system and these break if tinyalsa is using the older Android.mk build system. Oreo still picks up and tries to build the Android.mk found in the jni directory and this leads to a build conflict so it has been deleted. Signed-off-by: Richard Fitzgerald --- jni/Android.mk | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 jni/Android.mk (limited to 'jni/Android.mk') diff --git a/jni/Android.mk b/jni/Android.mk deleted file mode 100644 index b983f3a..0000000 --- a/jni/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ -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