Allow debugfs to be built for use in Android

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 22 insertions, 1 deletions

diff --git a/util/gen-android-files b/util/gen-android-files
index 240b9305..0be3c04f 100755
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -6,7 +6,16 @@ ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
 	e2fsck/nls-enable.h e2fsck/plausible.c e2fsck/plausible.h \
 	lib/blkid/blkid_types.h lib/uuid/uuid_types.h \
 	lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \
-	lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c"
+	lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c \
+	lib/ss/std_rqs.c debugfs/debug_cmds.c debugfs/ro_debug_cmds.c \
+	debugfs/extent_cmds.c debugfs/e2freefrag.c debugfs/create_inode.c \
+	debugfs/plausible.c debugfs/recovery.c debugfs/revoke.c"
+
+SS_DIR=$(pwd)/lib/ss
+MK_CMDS=/tmp/mk_cmds$$.sh
+
+sed -e "s;@SS_DIR@;$SS_DIR;" < $SS_DIR/mk_cmds.sh.in \
+    | sed -e "s/@AWK@/awk/" | sed -e "s/@SED@/sed/" > $MK_CMDS
 
 sed -e "s/@E2FSPROGS_VERSION@/$(git describe)/" < lib/ext2fs/ext2_err.et.in > lib/ext2fs/ext2_err.et
 
@@ -16,6 +25,16 @@ do
    awk -f lib/et/et_c.awk outfile=$i.c outfn=$(basename $i.c) $i.et
    awk -f lib/et/et_h.awk outfile=$i.h outfn=$(basename $i.h) $i.et
 done
+
+for i in lib/ss/std_rqs debugfs/debug_cmds debugfs/ro_debug_cmds \
+			debugfs/extent_cmds
+do
+    /bin/sh $MK_CMDS $i.ct
+    mv -f $(basename $i).c $i.c
+done
+
+rm -f $MK_CMDS
+
 rm -f misc/prof_err.[ch]
 cp e2fsck/prof_err.[ch] misc/
 
@@ -27,6 +46,8 @@ cp util/android_types.h lib/uuid/uuid_types.h
 cp util/android_config.h lib/config.h
 cp misc/plausible.? e2fsck/
 cp misc/nls-enable.h e2fsck/
+cp misc/e2freefrag.c misc/create_inode.c misc/plausible.c debugfs/
+cp e2fsck/recovery.c e2fsck/revoke.c debugfs/
 
 gcc -o gen_crc32ctable lib/ext2fs/gen_crc32ctable.c
 ./gen_crc32ctable > lib/ext2fs/crc32c_table.h