diff options
| author | Alex Deymo <deymo@google.com> | 2017-01-11 16:54:52 -0800 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2017-01-24 13:23:43 -0800 |
| commit | e8ed69493b7ab6237fb7114343789d3c213d2315 (patch) | |
| tree | df2692b3cf0ba840019ac3d72da420d4bcaf3b86 /squashfs_utils | |
| parent | ea69a18cd42bf757d49d733401f4ca6aa3994dc2 (diff) | |
| download | extras-e8ed69493b7ab6237fb7114343789d3c213d2315.tar.gz | |
Convert several libraries to soong.
This patch coverts libfec and its dependencies to soong. This also
updates the name of the libext2_uuid-host library removing the "-host"
suffix as that is also being converted to soong.
Also create a shared library for libfec given that it has quite a few
dependencies.
Bug: 34284069
Test: mmma system/extras; make checkbuild
Change-Id: Ib3ada6420bae32418a02ca92db664d0d24214e2f
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 |