diff options
author | Jaegeuk Kim <jaegeuk@google.com> | 2020-02-12 11:34:49 -0800 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2020-03-20 23:19:24 -0400 |
commit | 247973bcc46ffce4a00b9bc95d1a6d612cc0e9ad (patch) | |
tree | 31833b598ddc2fee847584a8ce085e4eaaf67cc2 | |
parent | c25ec972c9c667ed18ee32acea11404f017a5693 (diff) | |
download | e2fsprogs-247973bcc46ffce4a00b9bc95d1a6d612cc0e9ad.tar.gz |
AOSP: tune2fs, resize2fs: make ramdisk binaries.
Bug: 149391799
Change-Id: I5183755915710e28a603e3f718f16813ea9991a0
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
From AOSP commit: a13a88d0d557a396f63702fb8db008487e2384d7
-rw-r--r-- | misc/Android.bp | 10 | ||||
-rw-r--r-- | resize/Android.bp | 47 |
2 files changed, 39 insertions, 18 deletions
diff --git a/misc/Android.bp b/misc/Android.bp index c873c104d..a93bea4d5 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -143,6 +143,16 @@ cc_binary { static_libs: tune2fs_libs, } +cc_binary { + name: "tune2fs_ramdisk", + stem: "tune2fs", + static_executable: true, + ramdisk: true, + defaults: ["tune2fs-defaults"], + system_shared_libs: [], + static_libs: tune2fs_libs, +} + cc_library_static { name: "libtune2fs", defaults: ["tune2fs-defaults"], diff --git a/resize/Android.bp b/resize/Android.bp index 399201c3b..8acdcf620 100644 --- a/resize/Android.bp +++ b/resize/Android.bp @@ -1,10 +1,16 @@ // Copyright 2017 The Android Open Source Project -cc_binary { - name: "resize2fs", - host_supported: true, - defaults: ["e2fsprogs-defaults"], +resize2fs_libs = [ + "libext2fs", + "libext2_com_err", + "libext2_e2p", + "libext2_uuid", + "libext2_blkid", +] +cc_defaults { + name: "resize2fs-defaults", + defaults: ["e2fsprogs-defaults"], srcs: [ "extent.c", "resize2fs.c", @@ -13,27 +19,32 @@ cc_binary { "sim_progress.c", "resource_track.c", ], +} + +cc_binary { + name: "resize2fs", + host_supported: true, + defaults: ["resize2fs-defaults"], + // Host binaries can be compiled statically to be re-used in other environments. // For android binaries, we keep shared libraries to keep the binary size smaller. target: { host: { - static_libs: [ - "libext2fs", - "libext2_com_err", - "libext2_e2p", - "libext2_uuid", - "libext2_blkid", - ], + static_libs: resize2fs_libs, }, android: { - shared_libs: [ - "libext2fs", - "libext2_com_err", - "libext2_e2p", - "libext2_uuid", - "libext2_blkid", - ], + shared_libs: resize2fs_libs, }, }, system_shared_libs: ["libc", "libdl"], } + +cc_binary { + name: "resize2fs_ramdisk", + stem: "resize2fs", + static_executable: true, + ramdisk: true, + defaults: ["resize2fs-defaults"], + system_shared_libs: [], + static_libs: resize2fs_libs, +} |