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"
This commit is contained in:
commit
fb05a09a48
2 changed files with 23 additions and 27 deletions
27
Android.bp
27
Android.bp
|
@ -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",
|
||||
],
|
||||
}
|
23
Android.mk
Normal file
23
Android.mk
Normal file
|
@ -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)
|
||||
|
Loading…
Reference in a new issue