Merge "libtinycompress: Android.mk -> Android.bp"

This commit is contained in:
Treehugger Robot 2017-07-12 15:52:29 +00:00 committed by Gerrit Code Review
commit 6ded547e25
2 changed files with 32 additions and 28 deletions

32
Android.bp Normal file
View file

@ -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",
],
}

View file

@ -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)