diff options
| author | Alex Deymo <deymo@google.com> | 2017-01-12 09:48:04 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 23:00:54 -0400 |
| commit | a95c632b53a3d80f6ed4bf9c1c0fdf270c6b04a6 (patch) | |
| tree | 5531dff371b3f536aee548432c21643855cd8820 /resize | |
| parent | 82eb7e909022ab9a5a87e4b8d31b9b4c0c887e5f (diff) | |
| download | e2fsprogs-a95c632b53a3d80f6ed4bf9c1c0fdf270c6b04a6.tar.gz | |
AOSP: Convert e2fsprogs targets to soong.
This patch also removes all the "-host" and "_static" suffix from all
the libraries adding "unique_host_soname: true". This prevents
confusions with the host installed libraries.
A new "libext2_misc" library is introduced to export some files from
the misc/ directory to other binaries in this project.
Bug: 34220783
Test: mmma external/e2fsprogs
Change-Id: Ia1b689991346b11f8cb38f7c6ee356e666e01d6d
From AOSP commit: 7a9e1a96766d31a41b88f0a539fcc3d532b5c530
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/Android.bp | 24 | ||||
| -rw-r--r-- | resize/Android.mk | 45 |
2 files changed, 24 insertions, 45 deletions
diff --git a/resize/Android.bp b/resize/Android.bp new file mode 100644 index 00000000..5d8f0e8b --- /dev/null +++ b/resize/Android.bp @@ -0,0 +1,24 @@ +// Copyright 2017 The Android Open Source Project + +cc_binary { + name: "resize2fs", + host_supported: true, + + srcs: [ + "extent.c", + "resize2fs.c", + "main.c", + "online.c", + "sim_progress.c", + "resource_track.c", + ], + cflags: ["-W", "-Wall"], + shared_libs: [ + "libext2fs", + "libext2_com_err", + "libext2_e2p", + "libext2_uuid", + "libext2_blkid", + ], + system_shared_libs: ["libc"], +} diff --git a/resize/Android.mk b/resize/Android.mk deleted file mode 100644 index 12d6ab57..00000000 --- a/resize/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -resize2fs_src_files := \ - extent.c \ - resize2fs.c \ - main.c \ - online.c \ - sim_progress.c \ - resource_track.c - -resize2fs_c_includes := external/e2fsprogs/lib - -resize2fs_cflags := -O2 -g -W -Wall - -resize2fs_shared_libraries := \ - libext2fs \ - libext2_com_err \ - libext2_e2p \ - libext2_uuid \ - libext2_blkid - -resize2fs_system_shared_libraries := libc - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(resize2fs_src_files) -LOCAL_C_INCLUDES := $(resize2fs_c_includes) -LOCAL_CFLAGS := $(resize2fs_cflags) -LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries) -LOCAL_SYSTEM_SHARED_LIBRARIES := $(resize2fs_system_shared_libraries) -LOCAL_MODULE := resize2fs -LOCAL_MODULE_TAGS := optional -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(resize2fs_src_files) -LOCAL_C_INCLUDES := $(resize2fs_c_includes) -LOCAL_CFLAGS := $(resize2fs_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(resize2fs_shared_libraries)) -LOCAL_MODULE := resize2fs_host -LOCAL_MODULE_STEM := resize2fs -LOCAL_MODULE_TAGS := optional - -include $(BUILD_HOST_EXECUTABLE) |