diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-12 16:20:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-12 16:20:25 +0000 |
| commit | ff64557339915ea8a9718a0746424bf6c18c41b1 (patch) | |
| tree | b74e10a6e7ec1b5ddea1cdab796f89b0eaf89805 | |
| parent | 8b5bcd1d4059b24190b71f8a54523f1a88977799 (diff) | |
| parent | c189c3fded329fcb5358ebe349b329080fe3384b (diff) | |
| download | tinycompress-ff64557339915ea8a9718a0746424bf6c18c41b1.tar.gz | |
Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25 am: 846573ce25 am: a1e6f4979coreo-mr1-dev
am: c189c3fded
Change-Id: I8bc4ec8dbfc6e12940e19f95d20ed270763fa22f
| -rw-r--r-- | Android.bp | 32 | ||||
| -rw-r--r-- | Android.mk | 28 |
2 files changed, 32 insertions, 28 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..c22852c --- /dev/null +++ b/Android.bp @@ -0,0 +1,32 @@ +cc_library_shared { + name: "libtinycompress", + vendor: true, + + cflags: ["-Wno-macro-redefined"], + export_include_dirs: ["include"], + srcs: [ + "compress.c", + "utils.c", + ], + shared_libs: [ + "libcutils", + "libutils", + ], + header_libs: [ + "device_kernel_headers", + ], +} + +cc_binary { + name: "cplay", + vendor: true, + + cflags: ["-Wno-macro-redefined"], + local_include_dirs: ["include"], + srcs: ["cplay.c"], + shared_libs: [ + "libcutils", + "libutils", + "libtinycompress", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 8cd0495..0000000 --- a/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -#Do NOT Convert to Android.bp since this needs to compile with -#device specific kernel headers, that Soong does not support. -#https://android-review.googlesource.com/#/q/topic:revert-ltc-soong -#b/38117654 - -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 -LOCAL_VENDOR_MODULE := true -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_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) - |