Merge "tune2fs, resize2fs: make ramdisk binaries." am: 2c96981bf9 am: b42423eb54
Change-Id: Id0eee6b23a96cb80cf370e3d3229d8f9686f8596
diff --git a/misc/Android.bp b/misc/Android.bp
index c873c10..a93bea4 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -143,6 +143,16 @@
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 399201c..8acdcf6 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 @@
"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,
+}
