From a9cf808bd053d68ac1d97b1369f7952308f6a620 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Fri, 22 Sep 2023 12:28:34 +0800 Subject: Add exceptions for same-version ABI check for libbinder_rpc_unstable The ABI dumps for libbinder_rpc_unstable in version 34 were generated from the U branch. They contain different symbols from the source code in the main branch under -next release configuration. Test: make Bug: 301319358 Change-Id: Id3b57e19a99a48ebbda6defeab38ac5851843347 --- 34/64/arm/source-based/config.json | 27 +++++++++++++++++---------- 34/64/arm64/source-based/config.json | 27 +++++++++++++++++---------- 34/64/arm_arm64/source-based/config.json | 27 +++++++++++++++++---------- 34/64/x86/source-based/config.json | 27 +++++++++++++++++---------- 34/64/x86_64/source-based/config.json | 27 +++++++++++++++++---------- 34/64/x86_x86_64/source-based/config.json | 27 +++++++++++++++++---------- 6 files changed, 102 insertions(+), 60 deletions(-) diff --git a/34/64/arm/source-based/config.json b/34/64/arm/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/arm/source-based/config.json +++ b/34/64/arm/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} diff --git a/34/64/arm64/source-based/config.json b/34/64/arm64/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/arm64/source-based/config.json +++ b/34/64/arm64/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} diff --git a/34/64/arm_arm64/source-based/config.json b/34/64/arm_arm64/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/arm_arm64/source-based/config.json +++ b/34/64/arm_arm64/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} diff --git a/34/64/x86/source-based/config.json b/34/64/x86/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/x86/source-based/config.json +++ b/34/64/x86/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} diff --git a/34/64/x86_64/source-based/config.json b/34/64/x86_64/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/x86_64/source-based/config.json +++ b/34/64/x86_64/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} diff --git a/34/64/x86_x86_64/source-based/config.json b/34/64/x86_x86_64/source-based/config.json index 196e1ad..11be74b 100644 --- a/34/64/x86_x86_64/source-based/config.json +++ b/34/64/x86_x86_64/source-based/config.json @@ -1,11 +1,18 @@ { - "libbinder_rpc_unstable": [ - { - "target_version": "35", - "ignore_linker_set_keys": [ - "ARpcServer_newBoundSocket", - "ARpcServer_newInitUnixDomain" - ] - } - ] - } \ No newline at end of file + "libbinder_rpc_unstable": [ + { + "target_version": "current", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + }, + { + "target_version": "35", + "ignore_linker_set_keys": [ + "ARpcServer_newBoundSocket", + "ARpcServer_newInitUnixDomain" + ] + } + ] +} -- cgit v1.2.3