commit 95f785fc6c7564f33bddfc81c2053af89f264580
author Steven Moreland <smoreland@google.com> Fri May 05 17:54:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 17:54:54 2017 +0000
tree 57f0f4422932bf42eb1dce2b2246dce7475124c1
parent c5b90cd09a33141a55aa7ed27d3efa81a74e04aa
parent f827f5c7dfc7236251317351051119130b82515b

Merge "libtinycompress: Android.mk -> Android.bp" am: 8fbcb03b59 am: 995e3b6186
am: f827f5c7df

Change-Id: I1e5e0fc81f7bf4e6edbb1b0d96d8877c6a367424

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..edc739a
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,27 @@
+cc_library_shared {
+    name: "libtinycompress",
+
+    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",
+    ],
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 2de4be9..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-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)
-