summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Marshall <tdm@cyngn.com>2015-12-01 14:50:15 -0800
committerTom Marshall <tdm@cyngn.com>2015-12-01 14:55:22 -0800
commit0e70a879e499d798d3e58f19ebc872fb3b059651 (patch)
tree657f8257fea9956d69089ce3eb80fd438e2f6d95
parente023d79fba5a51296c81514c99c477c876c8c2fc (diff)
downloadbootable_recovery-0e70a879e499d798d3e58f19ebc872fb3b059651.zip
bootable_recovery-0e70a879e499d798d3e58f19ebc872fb3b059651.tar.gz
bootable_recovery-0e70a879e499d798d3e58f19ebc872fb3b059651.tar.bz2
fstools: Invite sfdisk to the party
Reduces recovery footprint by ~256kb. Change-Id: I544c14923859cee394485fac37b8c3822ec31b30
-rw-r--r--Android.mk3
-rw-r--r--fstools/Android.mk6
-rw-r--r--fstools/fstools.h3
3 files changed, 9 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 2797d5a..06b58e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -149,8 +149,7 @@ ifeq ($(ONE_SHOT_MAKEFILE),)
LOCAL_ADDITIONAL_DEPENDENCIES += \
fstools \
recovery_mkshrc \
- minivold \
- recovery_sgdisk
+ minivold
endif
diff --git a/fstools/Android.mk b/fstools/Android.mk
index 787a382..83dcecb 100644
--- a/fstools/Android.mk
+++ b/fstools/Android.mk
@@ -36,6 +36,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \
libf2fs_fsck_static \
libf2fs_mkfs_static
+LOCAL_WHOLE_STATIC_LIBRARIES += \
+ libsgdisk_static
+
LOCAL_STATIC_LIBRARIES := \
libext2_blkid \
libext2_uuid \
@@ -44,7 +47,8 @@ LOCAL_STATIC_LIBRARIES := \
libext2_com_err \
libext2_e2p \
libc++_static \
- libc
+ libc \
+ libm
FSTOOLS_LINKS := \
e2fsck mke2fs tune2fs fsck.ext4 mkfs.ext4 \
diff --git a/fstools/fstools.h b/fstools/fstools.h
index 2d666bd..97fcfde 100644
--- a/fstools/fstools.h
+++ b/fstools/fstools.h
@@ -36,6 +36,8 @@ int mkfs_f2fs_main(int argc, char **argv);
int fsck_f2fs_main(int argc, char **argv);
int fibmap_main(int argc, char **argv);
+int sgdisk_main(int argc, char **argv);
+
struct fstools_cmd {
const char *name;
int (*main_func)(int argc, char **argv);
@@ -55,6 +57,7 @@ static const struct fstools_cmd fstools_cmds[] = {
{ "mount.ntfs", mount_ntfs3g_main },
{ "mkfs.f2fs", mkfs_f2fs_main },
{ "fsck.f2fs", fsck_f2fs_main },
+ { "sgdisk", sgdisk_main },
{ NULL, NULL },
};