aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaylor Holberton <taylorcholberton@gmail.com>2017-10-19 12:48:42 -0400
committerGitHub <noreply@github.com>2017-10-19 12:48:42 -0400
commitdbc2b7ba0869a4b3b0f5942e7eccea4ac7b993fb (patch)
tree3123eadb09723f7141dc68dc8fc7f24761cfe3c6
parentf40bda81bfb2c8d3d3ba6698695e2bedef9da278 (diff)
parentcdcc350bf9662030a84d9ae4b18f31e8340c5df0 (diff)
Merge pull request #104 from rfvirgil/master
Replace old style Android.mk with new Android.bp
-rw-r--r--Android.bp52
-rw-r--r--jni/Android.mk47
2 files changed, 52 insertions, 47 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..0d4122d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,52 @@
+cc_library {
+ name: "libtinyalsa",
+ host_supported: true,
+ vendor_available: true,
+ srcs: [
+ "src/mixer.c",
+ "src/pcm.c",
+ ],
+ cflags: ["-Werror", "-Wno-macro-redefined"],
+ export_include_dirs: ["include"],
+ local_include_dirs: ["include"],
+
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
+
+cc_binary {
+ name: "tinyplay",
+ host_supported: true,
+ srcs: ["utils/tinyplay.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
+
+cc_binary {
+ name: "tinycap",
+ srcs: ["utils/tinycap.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+}
+
+cc_binary {
+ name: "tinymix",
+ srcs: ["utils/tinymix.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror", "-Wall"],
+}
+
+cc_binary {
+ name: "tinypcminfo",
+ srcs: ["utils/tinypcminfo.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+}
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)
-