aboutsummaryrefslogtreecommitdiff
path: root/util/gen-android-files
diff options
context:
space:
mode:
Diffstat (limited to 'util/gen-android-files')
-rwxr-xr-xutil/gen-android-files7
1 files changed, 7 insertions, 0 deletions
diff --git a/util/gen-android-files b/util/gen-android-files
index 937496bc..cab4e8d4 100755
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -37,9 +37,16 @@ rm -f $MK_CMDS
cp lib/blkid/blkid.h.in lib/blkid/blkid.h
cp lib/uuid/uuid.h.in lib/uuid/uuid.h
+
cp util/android_types.h lib/ext2fs/ext2_types.h
cp util/android_types.h lib/blkid/blkid_types.h
cp util/android_types.h lib/uuid/uuid_types.h
+# Copied header files having exactly same content results in debug output
+# differences on RBE. Hence modify the #define's appropriately.
+sed -i 's/#define _LINUX_TYPES_H/#define _BLKID_TYPES_H/g' lib/blkid/blkid_types.h
+sed -i 's/#define _LINUX_TYPES_H/#define _EXT2_TYPES_H/g' lib/ext2fs/ext2_types.h
+sed -i 's/#define _LINUX_TYPES_H/#define _UUID_TYPES_H/g' lib/uuid/uuid_types.h
+
cp util/android_config.h lib/config.h
cp misc/e2freefrag.c debugfs/
cp e2fsck/recovery.c e2fsck/revoke.c debugfs/