aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2020-02-12 11:34:49 -0800
committerJaegeuk Kim <jaegeuk@google.com>2020-03-11 16:40:29 +0000
commit9b07069cc3d80275fc87065874303e0a444df891 (patch)
tree0e5f18d42dd4de1e00c0ba681910bf89cf306847
parent132f621ff8ca4ddd60e897c3145a1acbb00eda14 (diff)
downloade2fsprogs-9b07069cc3d80275fc87065874303e0a444df891.tar.gz
tune2fs, resize2fs: make ramdisk binaries.
Bug: 149391799 Change-Id: I5183755915710e28a603e3f718f16813ea9991a0 Merged-In: I5183755915710e28a603e3f718f16813ea9991a0 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
-rw-r--r--misc/Android.bp10
-rw-r--r--resize/Android.bp47
2 files changed, 39 insertions, 18 deletions
diff --git a/misc/Android.bp b/misc/Android.bp
index c873c104..a93bea4d 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 399201c3..8acdcf62 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,
+}