diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-01-09 16:15:30 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-03-20 23:08:04 -0400 |
| commit | 48353695468f8a514c3ba4f786aab287e843592a (patch) | |
| tree | 73474ac924f236a9e9296e58f628580d6bd6fb64 | |
| parent | d4cde4925480eb71510bb81e8fc878cf6a5dc4cc (diff) | |
| download | e2fsprogs-48353695468f8a514c3ba4f786aab287e843592a.tar.gz | |
AOSP: Change #define to _BLKID_TYPES_H
blkid_types.h and ext_types.h having the exact same content results in
mismatches in remote RBE builds. Given blkid_types.h is actually
supposed to be different, changing this to remove the mismatch.
Test: Ran a build, and all e2fsprogs mismatches went away between
local/remote.
Change-Id: I63ab1719ee1d0ccd28907f0bc99531260251fa99
From AOSP commit: ec10b513c283706f984edeec47301b0661f7d283
| -rw-r--r-- | util/android_types.h | 4 | ||||
| -rwxr-xr-x | util/gen-android-files | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/util/android_types.h b/util/android_types.h index a8d7cff1f..5f05903da 100644 --- a/util/android_types.h +++ b/util/android_types.h @@ -4,8 +4,8 @@ * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) -#define _EXT2_TYPES_H + !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H)) +#define _LINUX_TYPES_H typedef unsigned char __u8; typedef __signed__ char __s8; diff --git a/util/gen-android-files b/util/gen-android-files index 937496bca..cab4e8d4b 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/ |