Merge "Convert to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9c0cfad
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,51 @@
+cc_library {
+ name: "libtinyalsa",
+ host_supported: true,
+ srcs: [
+ "mixer.c",
+ "pcm.c",
+ ],
+ cflags: ["-Werror"],
+ export_include_dirs: ["include"],
+ local_include_dirs: ["include"],
+
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
+
+cc_binary {
+ name: "tinyplay",
+ host_supported: true,
+ srcs: ["tinyplay.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
+
+cc_binary {
+ name: "tinycap",
+ srcs: ["tinycap.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+}
+
+cc_binary {
+ name: "tinymix",
+ srcs: ["tinymix.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+}
+
+cc_binary {
+ name: "tinypcminfo",
+ srcs: ["tinypcminfo.c"],
+ shared_libs: ["libtinyalsa"],
+ cflags: ["-Werror"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b3da408..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= mixer.c pcm.c
-LOCAL_MODULE := libtinyalsa
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-include $(BUILD_SHARED_LIBRARY)
-
-ifeq ($(HOST_OS), linux)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= mixer.c pcm.c
-LOCAL_MODULE := libtinyalsa
-LOCAL_STATIC_LIBRARIES:= libcutils libutils
-LOCAL_CFLAGS += -Werror
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-include $(BUILD_HOST_STATIC_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= tinyplay.c
-LOCAL_MODULE := tinyplay
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-include $(BUILD_EXECUTABLE)
-
-ifeq ($(HOST_OS), linux)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= tinyplay.c
-LOCAL_MODULE := tinyplay
-LOCAL_STATIC_LIBRARIES:= libcutils libutils libtinyalsa
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-include $(BUILD_HOST_EXECUTABLE)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= tinycap.c
-LOCAL_MODULE := tinycap
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= tinymix.c
-LOCAL_MODULE := tinymix
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= tinypcminfo.c
-LOCAL_MODULE := tinypcminfo
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
-include $(BUILD_EXECUTABLE)