diff options
| author | Steven Moreland <smoreland@google.com> | 2017-05-09 01:09:34 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-05-08 18:13:10 -0700 |
| commit | f4cdefcd0c4eb2ac75810ce70a2309e61c9a6e7c (patch) | |
| tree | c65013e66ff9d724768a4a60e586dd47da985f0b | |
| parent | 015a4c9a4ba7e905dadb93fe53f8d60f8b61e62c (diff) | |
| download | tinycompress-f4cdefcd0c4eb2ac75810ce70a2309e61c9a6e7c.tar.gz | |
Revert "libtinycompress: Android.mk -> Android.bp"
This reverts commit af6c4c00572e5a43e2242de899992f4fa8d0b729.
Reason for revert: b/38117654
Change-Id: Iaf808d3ba12ced816be251214cb20ceba247e9ff
| -rw-r--r-- | Android.bp | 27 | ||||
| -rw-r--r-- | Android.mk | 23 |
2 files changed, 23 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index edc739a..0000000 --- a/Android.bp +++ /dev/null @@ -1,27 +0,0 @@ -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", - ], -} 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) + |