summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2023-12-15 10:23:03 +0000
committerHsin-Yi Chen <hsinyichen@google.com>2023-12-15 10:23:57 +0000
commitc2cfb60bf64e954f1a3c4c8b5446e69541b0dd4c (patch)
tree79bbc490f60e81424f9f88e29468d776c812f62f
parent8999e597aaa790983e055da5e010f25565905c34 (diff)
downloadplatform-c2cfb60bf64e954f1a3c4c8b5446e69541b0dd4c.tar.gz
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 Bug: 316227224 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9cf808bd053d68ac1d97b1369f7952308f6a620) Merged-In: Id3b57e19a99a48ebbda6defeab38ac5851843347 Change-Id: Id3b57e19a99a48ebbda6defeab38ac5851843347
-rw-r--r--34/64/arm/source-based/config.json27
-rw-r--r--34/64/arm64/source-based/config.json27
-rw-r--r--34/64/arm_arm64/source-based/config.json27
-rw-r--r--34/64/x86/source-based/config.json27
-rw-r--r--34/64/x86_64/source-based/config.json27
-rw-r--r--34/64/x86_x86_64/source-based/config.json27
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"
+ ]
+ }
+ ]
+}