Revert^2 "ANDROID: GKI: update symbol list file for xiaomi" This reverts commit b683167c984a2fd9c90eff67aa77c240b2a78918. Revert submission 3989175-revert-3981670-FQQBQZBBFZ Reason for revert: These patches were incorrectly identified as the cause of a build-break. Reverted changes: /q/submissionid:3989175-revert-3981670-FQQBQZBBFZ Bug: 489485148 Change-Id: I60b129c95eb95dc753de5eca713c06e89cc4b133 Signed-off-by: Todd Kjos <tkjos@google.com>
diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index e7caafb1..44958ba 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg
@@ -328890,6 +328890,18 @@ parameter_id: 0xfc0e1dbd } function { + id: 0x9b65d49e + return_type_id: 0x6720d32f + parameter_id: 0x18bd6530 + parameter_id: 0x36f98e5c + parameter_id: 0x4585663f + parameter_id: 0x33756485 + parameter_id: 0x92233392 + parameter_id: 0x33756485 + parameter_id: 0x33756485 + parameter_id: 0x6720d32f +} +function { id: 0x9b65de16 return_type_id: 0x6720d32f parameter_id: 0x17047654 @@ -349261,6 +349273,24 @@ full_name: "__traceiter_android_vh_alloc_pages_slowpath" } elf_symbol { + id: 0xf3650061 + name: "__traceiter_android_vh_alloc_pages_slowpath_end" + is_defined: true + symbol_type: FUNCTION + crc: 0xf3ad466f + type_id: 0x9b65d49e + full_name: "__traceiter_android_vh_alloc_pages_slowpath_end" +} +elf_symbol { + id: 0x23d552d4 + name: "__traceiter_android_vh_alloc_pages_slowpath_start" + is_defined: true + symbol_type: FUNCTION + crc: 0x2665cc80 + type_id: 0x9b17d9b6 + full_name: "__traceiter_android_vh_alloc_pages_slowpath_start" +} +elf_symbol { id: 0x2bc6c2c3 name: "__traceiter_android_vh_alloc_pages_start" is_defined: true @@ -354787,6 +354817,24 @@ full_name: "__tracepoint_android_vh_alloc_pages_slowpath" } elf_symbol { + id: 0xff9480af + name: "__tracepoint_android_vh_alloc_pages_slowpath_end" + is_defined: true + symbol_type: OBJECT + crc: 0xe49b2157 + type_id: 0x18ccbd2c + full_name: "__tracepoint_android_vh_alloc_pages_slowpath_end" +} +elf_symbol { + id: 0xa47162fe + name: "__tracepoint_android_vh_alloc_pages_slowpath_start" + is_defined: true + symbol_type: OBJECT + crc: 0x8ae9ae07 + type_id: 0x18ccbd2c + full_name: "__tracepoint_android_vh_alloc_pages_slowpath_start" +} +elf_symbol { id: 0x25e8e725 name: "__tracepoint_android_vh_alloc_pages_start" is_defined: true @@ -422762,6 +422810,8 @@ symbol_id: 0x33f9278c symbol_id: 0x2e343246 symbol_id: 0xa6e329cd + symbol_id: 0xf3650061 + symbol_id: 0x23d552d4 symbol_id: 0x2bc6c2c3 symbol_id: 0x9c240ef1 symbol_id: 0x505f4289 @@ -423376,6 +423426,8 @@ symbol_id: 0x37776872 symbol_id: 0xfc735654 symbol_id: 0x1ebb872f + symbol_id: 0xff9480af + symbol_id: 0xa47162fe symbol_id: 0x25e8e725 symbol_id: 0xea695d5b symbol_id: 0xd82141b7
diff --git a/android/abi_gki_aarch64_xiaomi b/android/abi_gki_aarch64_xiaomi index 3d0464d1..94d4232 100644 --- a/android/abi_gki_aarch64_xiaomi +++ b/android/abi_gki_aarch64_xiaomi
@@ -562,4 +562,8 @@ __tracepoint_android_vh_alloc_pages_start __traceiter_android_vh_alloc_pages_end __tracepoint_android_vh_alloc_pages_end +__traceiter_android_vh_alloc_pages_slowpath_start +__tracepoint_android_vh_alloc_pages_slowpath_start +__traceiter_android_vh_alloc_pages_slowpath_end +__tracepoint_android_vh_alloc_pages_slowpath_end