From db9d7ba7061247446ea22220a32179d91d3e6021 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Tue, 14 Nov 2023 22:49:05 +0000
Subject: [PATCH] ANDROID: Update the ABI representation

INFO: type 'struct fscrypt_info' changed
  member 'u8 ci_data_unit_bits' was added
  member 'u8 ci_data_units_per_block_bits' was added

type 'struct fscrypt_policy_v2' changed
  member '__u8 log2_data_unit_size' was added
  member changed from '__u8 __reserved[4]' to '__u8 __reserved[3]'
    offset changed from 32 to 40
    type changed from '__u8[4]' to '__u8[3]'
      number of elements changed from 4 to 3

Bug: 299136786
Bug: 302588300
Change-Id: Idbbc2123961a41d395323c72cef67d94bdd17ab0
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 android/abi_gki_aarch64.stg | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index def56ab81552..a393ee0f1c95 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -41080,18 +41080,18 @@ member {
   type_id: 0x5522ef22
   offset: 4160
 }
+member {
+  id: 0x5e4e4c08
+  name: "__reserved"
+  type_id: 0x3e3c1b86
+  offset: 40
+}
 member {
   id: 0x5e9651c5
   name: "__reserved"
   type_id: 0xe62ebf07
   offset: 32
 }
-member {
-  id: 0x5ed0cb87
-  name: "__reserved"
-  type_id: 0xa0b4fda8
-  offset: 32
-}
 member {
   id: 0x5ee63f2d
   name: "__reserved"
@@ -60741,6 +60741,18 @@ member {
   type_id: 0x4585663f
   offset: 416
 }
+member {
+  id: 0xb757dfb6
+  name: "ci_data_unit_bits"
+  type_id: 0x295c7202
+  offset: 144
+}
+member {
+  id: 0x059182f5
+  name: "ci_data_units_per_block_bits"
+  type_id: 0x295c7202
+  offset: 152
+}
 member {
   id: 0x5173269c
   name: "ci_dentry"
@@ -118177,6 +118189,12 @@ member {
   type_id: 0x97f9278b
   offset: 896
 }
+member {
+  id: 0x87fb0c15
+  name: "log2_data_unit_size"
+  type_id: 0xb3e7bac9
+  offset: 32
+}
 member {
   id: 0xa0fdc6e2
   name: "log2_diff_max_min_luma_coding_block_size"
@@ -229554,6 +229572,8 @@ struct_union {
     member_id: 0x0534711c
     member_id: 0x81f8c824
     member_id: 0x796f533e
+    member_id: 0xb757dfb6
+    member_id: 0x059182f5
     member_id: 0x5e6a6d58
     member_id: 0x4025e474
     member_id: 0xee6c5106
@@ -229695,7 +229715,8 @@ struct_union {
     member_id: 0x4bfa9ecc
     member_id: 0x3ff8b433
     member_id: 0x2ddb6585
-    member_id: 0x5ed0cb87
+    member_id: 0x87fb0c15
+    member_id: 0x5e4e4c08
     member_id: 0xcf7375db
   }
 }