commit 71b43c3e005a15b83c564a835361e2b7aa56e086
author Kalesh Singh <kaleshsingh@google.com> Fri Aug 25 09:58:36 2023 -0700
committer Chris Goldsworthy <quic_cgoldswo@quicinc.com> Mon Aug 28 22:37:15 2023 +0000
tree bcf43c3671cd1e17afca00a072bdc62ae18986cc
parent 725fdf9ba3466bf6b4164155529290d78ba0d58b

ANDROID: GKI: Update ABI for zsmalloc fixes

zs_pool->lock was added upstream as a replacement for the size_class
locks.

The tooling over-cautiously reports this as a ABI breakage but both
of these structs (zs_pool and size_class) are internal to zsmalloc.c.

Update the ABI to allow these changes.

Bug: 297093100
Bug: 297936826
Change-Id: Ib9fc5a036f75d89fb6bee4c146034f6c81759e04
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>

android/abi_gki_aarch64.stg

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 8086b4e..8fcb46f 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -90370,10 +90370,9 @@
   offset: 712
 }
 member {
-  id: 0xf667d80f
+  id: 0xf667dcee
   name: "fullness_list"
   type_id: 0xb8bf135c
-  offset: 64
 }
 member {
   id: 0xfeb50ea0
@@ -101851,12 +101850,6 @@
   offset: 320
 }
 member {
-  id: 0xad7c8a98
-  name: "index"
-  type_id: 0x4585663f
-  offset: 672
-}
-member {
   id: 0xad7c8ba4
   name: "index"
   type_id: 0x4585663f
@@ -101869,6 +101862,12 @@
   offset: 480
 }
 member {
+  id: 0xad7c8d2b
+  name: "index"
+  type_id: 0x4585663f
+  offset: 608
+}
+member {
   id: 0xad7c8d72
   name: "index"
   type_id: 0x4585663f
@@ -113343,6 +113342,12 @@
   offset: 768
 }
 member {
+  id: 0x2d1fe43b
+  name: "lock"
+  type_id: 0xf313e71a
+  offset: 17536
+}
+member {
   id: 0x2d1fe44c
   name: "lock"
   type_id: 0xf313e71a
@@ -121006,12 +121011,6 @@
   offset: 768
 }
 member {
-  id: 0xdb33fcdf
-  name: "migrate_lock"
-  type_id: 0xf4933b90
-  offset: 17536
-}
-member {
   id: 0x8edaa968
   name: "migrate_page"
   type_id: 0x2d9ade31
@@ -133786,10 +133785,10 @@
   type_id: 0xad7c0a89
 }
 member {
-  id: 0x7a226550
+  id: 0x7a226b7d
   name: "objs_per_zspage"
   type_id: 0x6720d32f
-  offset: 608
+  offset: 544
 }
 member {
   id: 0x33953b25
@@ -138582,10 +138581,10 @@
   bitsize: 1
 }
 member {
-  id: 0x338646f2
+  id: 0x338649f9
   name: "pages_per_zspage"
   type_id: 0x6720d32f
-  offset: 640
+  offset: 576
 }
 member {
   id: 0xf9521fd2
@@ -170128,18 +170127,18 @@
   offset: 96
 }
 member {
-  id: 0xd91935d3
-  name: "size"
-  type_id: 0x6720d32f
-  offset: 576
-}
-member {
   id: 0xd9193607
   name: "size"
   type_id: 0x6720d32f
   offset: 896
 }
 member {
+  id: 0xd91937b9
+  name: "size"
+  type_id: 0x6720d32f
+  offset: 512
+}
+member {
   id: 0xd9193b66
   name: "size"
   type_id: 0x6720d32f
@@ -175840,10 +175839,10 @@
   offset: 896
 }
 member {
-  id: 0xb91e0d04
+  id: 0xb91e0940
   name: "stats"
   type_id: 0x6b61371d
-  offset: 704
+  offset: 640
 }
 member {
   id: 0xb920e0d3
@@ -243356,14 +243355,13 @@
   kind: STRUCT
   name: "size_class"
   definition {
-    bytesize: 136
-    member_id: 0x2d1fec85
-    member_id: 0xf667d80f
-    member_id: 0xd91935d3
-    member_id: 0x7a226550
-    member_id: 0x338646f2
-    member_id: 0xad7c8a98
-    member_id: 0xb91e0d04
+    bytesize: 128
+    member_id: 0xf667dcee
+    member_id: 0xd91937b9
+    member_id: 0x7a226b7d
+    member_id: 0x338649f9
+    member_id: 0xad7c8d2b
+    member_id: 0xb91e0940
   }
 }
 struct_union {
@@ -259130,7 +259128,7 @@
     member_id: 0xb9089225
     member_id: 0x868caa9e
     member_id: 0x8a67a9e5
-    member_id: 0xdb33fcdf
+    member_id: 0x2d1fe43b
   }
 }
 struct_union {