Merge changes from topic 'revert-ltc-soong' am: fb05a09a48
am: 1997deeb8c
Change-Id: I71b9aac009af507fd7638029292efb8ca3226219
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 565cfb7..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,27 +0,0 @@
-cc_library_shared {
- name: "libtinycompress",
- vendor_available: true,
- cflags: ["-Wno-macro-redefined"],
- export_include_dirs: ["include"],
- srcs: [
- "compress.c",
- "utils.c",
- ],
- shared_libs: [
- "libcutils",
- "libutils",
- ],
-}
-
-cc_binary {
- name: "cplay",
-
- cflags: ["-Wno-macro-redefined"],
- local_include_dirs: ["include"],
- srcs: ["cplay.c"],
- shared_libs: [
- "libcutils",
- "libutils",
- "libtinycompress",
- ],
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..2de4be9
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,23 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS := -Wno-macro-redefined
+LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= compress.c utils.c
+LOCAL_MODULE := libtinycompress
+LOCAL_SHARED_LIBRARIES:= libcutils libutils
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS := -Wno-macro-redefined
+LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= cplay.c
+LOCAL_MODULE := cplay
+LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinycompress
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
+