diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index 3c34edd57c66..9f9a4eb216c3 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg @@ -43671,6 +43671,11 @@ member { type_id: 0x69fa9768 offset: 256 } +member { + id: 0x39d6d358 + type_id: 0x6875099c + offset: 32 +} member { id: 0x39e9b87f type_id: 0x6888b6e5 @@ -116525,6 +116530,11 @@ member { type_id: 0x34544a3f offset: 1216 } +member { + id: 0xfa946861 + name: "ipv4_nh" + type_id: 0xc9082b19 +} member { id: 0x3b9e102b name: "ipv6" @@ -116594,6 +116604,11 @@ member { type_id: 0x12e0cbae offset: 704 } +member { + id: 0xab39140b + name: "ipv6_nh" + type_id: 0x6d25e07f +} member { id: 0x9cf559e0 name: "ipv6_pinfo_offset" @@ -119164,6 +119179,12 @@ member { type_id: 0x340dea21 offset: 384 } +member { + id: 0x632a482d + name: "kern_flags" + type_id: 0xc9082b19 + offset: 224 +} member { id: 0x3afd0e3e name: "kern_hyp_va" @@ -127557,6 +127578,12 @@ member { name: "map" type_id: 0x04b193cc } +member { + id: 0x8df2c9e6 + name: "map" + type_id: 0x04b193cc + offset: 128 +} member { id: 0x8df87907 name: "map" @@ -127792,6 +127819,12 @@ member { name: "map_id" type_id: 0xe62ebf07 } +member { + id: 0x86e8b50e + name: "map_id" + type_id: 0xc9082b19 + offset: 256 +} member { id: 0xa32be5db name: "map_ifindex" @@ -128088,6 +128121,12 @@ member { type_id: 0x6e73208e offset: 192 } +member { + id: 0x2a09386d + name: "map_type" + type_id: 0x6e73208e + offset: 288 +} member { id: 0x2a261544 name: "map_type" @@ -141594,6 +141633,12 @@ member { name: "nh" type_id: 0x1f9da9a8 } +member { + id: 0x713b4511 + name: "nh" + type_id: 0x1e9c55da + offset: 320 +} member { id: 0xdb1c1db1 name: "nh_all" @@ -141622,6 +141667,11 @@ member { name: "nh_entry" type_id: 0x17b2105b } +member { + id: 0xd51ec347 + name: "nh_family" + type_id: 0xc9082b19 +} member { id: 0x9fb787a3 name: "nh_flags" @@ -199512,6 +199562,11 @@ member { name: "tgt" type_id: 0x3df0a7d3 } +member { + id: 0x073a3a88 + name: "tgt_index" + type_id: 0x92233392 +} member { id: 0xe9c20711 name: "tgt_qps" @@ -199524,6 +199579,12 @@ member { type_id: 0x28b9ec9a offset: 192 } +member { + id: 0xc9d6516c + name: "tgt_value" + type_id: 0x18bd6530 + offset: 64 +} member { id: 0x141d2755 name: "thaw" @@ -226777,6 +226838,15 @@ struct_union { member_id: 0x12f2249e } } +struct_union { + id: 0x6875099c + kind: UNION + definition { + bytesize: 16 + member_id: 0xfa946861 + member_id: 0xab39140b + } +} struct_union { id: 0x6888b6e5 kind: UNION @@ -231444,6 +231514,16 @@ struct_union { member_id: 0x982b4630 } } +struct_union { + id: 0x1e9c55da + kind: STRUCT + name: "bpf_nh_params" + definition { + bytesize: 20 + member_id: 0xd51ec347 + member_id: 0x39d6d358 + } +} struct_union { id: 0x3b3bbe3f kind: STRUCT @@ -231640,6 +231720,22 @@ struct_union { member_id: 0x0082372e } } +struct_union { + id: 0x212d37a1 + kind: STRUCT + name: "bpf_redirect_info" + definition { + bytesize: 64 + member_id: 0x073a3a88 + member_id: 0xc9d6516c + member_id: 0x8df2c9e6 + member_id: 0x2da184bc + member_id: 0x632a482d + member_id: 0x86e8b50e + member_id: 0x2a09386d + member_id: 0x713b4511 + } +} struct_union { id: 0x3a354a67 kind: STRUCT @@ -376131,6 +376227,15 @@ elf_symbol { type_id: 0x1de47b51 full_name: "bpf_prog_sub" } +elf_symbol { + id: 0x56b332ad + name: "bpf_redirect_info" + is_defined: true + symbol_type: OBJECT + crc: 0x678abaea + type_id: 0x212d37a1 + full_name: "bpf_redirect_info" +} elf_symbol { id: 0x6a712ee1 name: "bpf_stats_enabled_key" @@ -437615,6 +437720,7 @@ interface { symbol_id: 0x6ad917a1 symbol_id: 0xdeb1861d symbol_id: 0x7661d150 + symbol_id: 0x56b332ad symbol_id: 0x6a712ee1 symbol_id: 0xe594a242 symbol_id: 0x3afeb397 diff --git a/android/abi_gki_aarch64_virtual_device b/android/abi_gki_aarch64_virtual_device index db28f9c6be75..b13482c21b31 100644 --- a/android/abi_gki_aarch64_virtual_device +++ b/android/abi_gki_aarch64_virtual_device @@ -12,6 +12,7 @@ __arch_copy_to_user arm64_use_ng_mappings bcmp + bpf_redirect_info bpf_trace_run1 bpf_trace_run2 bpf_trace_run3