From 82c0e62db7e5ca5874fc203fe01ee5475fb5c0c6 Mon Sep 17 00:00:00 2001
From: Kousik Kumar <kousikk@google.com>
Date: Thu, 9 Jan 2020 16:15:30 -0800
Subject: [DO NOT MERGE] 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.
Bug: b/166182389

Change-Id: Ia71e9e37035198dc3a44b38e41221fb65f048b15
Merged-In: I63ab1719ee1d0ccd28907f0bc99531260251fa99
---
 lib/blkid/blkid_types.h | 4 ++--
 lib/ext2fs/ext2_types.h | 2 +-
 lib/uuid/uuid_types.h   | 4 ++--
 util/android_types.h    | 4 ++--
 util/gen-android-files  | 7 +++++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h
index a8d7cff1..297a69da 100644
--- a/lib/blkid/blkid_types.h
+++ b/lib/blkid/blkid_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 _BLKID_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
diff --git a/lib/ext2fs/ext2_types.h b/lib/ext2fs/ext2_types.h
index a8d7cff1..0e5ebe67 100644
--- a/lib/ext2fs/ext2_types.h
+++ b/lib/ext2fs/ext2_types.h
@@ -4,7 +4,7 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_EXT2_TYPES_H))
+	!defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
 #define _EXT2_TYPES_H
 
 typedef unsigned char __u8;
diff --git a/lib/uuid/uuid_types.h b/lib/uuid/uuid_types.h
index a8d7cff1..35e51518 100644
--- a/lib/uuid/uuid_types.h
+++ b/lib/uuid/uuid_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 _UUID_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
diff --git a/util/android_types.h b/util/android_types.h
index a8d7cff1..5f05903d 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 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/
-- 
cgit v1.2.3