diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-09 15:36:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-09 15:36:38 +0000 |
| commit | fb05a09a487ef14dfdf45698aeab6058447d8e05 (patch) | |
| tree | c65013e66ff9d724768a4a60e586dd47da985f0b | |
| parent | a8e6d4ea56cc5198565ec90c52091eebe56cc1c8 (diff) | |
| parent | f4cdefcd0c4eb2ac75810ce70a2309e61c9a6e7c (diff) | |
| download | tinycompress-fb05a09a487ef14dfdf45698aeab6058447d8e05.tar.gz | |
Merge changes from topic 'revert-ltc-soong'
* changes:
Revert "libtinycompress: Android.mk -> Android.bp"
Revert "Add vendor_available:true to libtinycompress so it can be in VNDK"
| -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 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) + |