diff options
| author | Alex Deymo <deymo@google.com> | 2017-01-26 00:01:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-26 00:01:51 +0000 |
| commit | 16e748e9954253b3486c8d36abca415e3e83217e (patch) | |
| tree | 66a34e950e97ef4959943e85a61cd0cf8a3e119b /squashfs_utils | |
| parent | 6f2b21db1fa2632f31213d0b841ae3462f354925 (diff) | |
| parent | 0564df635e1e8fa71e41e8d3da2d4acd61f913b1 (diff) | |
| download | extras-16e748e9954253b3486c8d36abca415e3e83217e.tar.gz | |
Merge "Convert several libraries to soong." am: 3b680bb63e am: 087a92d552 am: e27390725c
am: 0564df635e
Change-Id: I74d6d0fc293cf4b6522344fe6be1dd9e19496ac1
Diffstat (limited to 'squashfs_utils')
| -rw-r--r-- | squashfs_utils/Android.bp | 22 | ||||
| -rw-r--r-- | squashfs_utils/Android.mk | 17 |
2 files changed, 22 insertions, 17 deletions
diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp new file mode 100644 index 00000000..c0d9b18b --- /dev/null +++ b/squashfs_utils/Android.bp @@ -0,0 +1,22 @@ +// Copyright 2015 The Android Open Source Project + +cc_library_static { + name: "libsquashfs_utils", + host_supported: true, + srcs: [ + "squashfs_utils.c", + ], + include_dirs: ["external/squashfs-tools/squashfs-tools"], + export_include_dirs: ["."], + + static_libs: [ + "libcutils", + ], + + target: { + host: { + cflags: ["-Wall", "-Werror", "-D_GNU_SOURCE", "-DSQUASHFS_NO_KLOG"] + }, + }, + +} diff --git a/squashfs_utils/Android.mk b/squashfs_utils/Android.mk index b80da092..bf60cf4c 100644 --- a/squashfs_utils/Android.mk +++ b/squashfs_utils/Android.mk @@ -3,23 +3,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := squashfs_utils.c -LOCAL_STATIC_LIBRARIES := libcutils -LOCAL_C_INCLUDES := external/squashfs-tools/squashfs-tools -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_MODULE := libsquashfs_utils -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := squashfs_utils.c -LOCAL_STATIC_LIBRARIES := libcutils -LOCAL_C_INCLUDES := external/squashfs-tools/squashfs-tools -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE -DSQUASHFS_NO_KLOG -LOCAL_MODULE := libsquashfs_utils -include $(BUILD_HOST_STATIC_LIBRARY) - -include $(CLEAR_VARS) LOCAL_MODULE := mksquashfsimage.sh LOCAL_SRC_FILES := mksquashfsimage.sh LOCAL_MODULE_CLASS := EXECUTABLES |