commit 84905a00ec1d76244fb791907819b6395da41f04
author Xin Li <delphij@google.com> Sat Oct 07 00:20:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 07 00:20:48 2023 +0000
tree 79bbc490f60e81424f9f88e29468d776c812f62f
parent 1518f7e5d62fa9e810a6ea603fb35929905464b6
parent 8999e597aaa790983e055da5e010f25565905c34

[automerger skipped] Merge Android 14 am: 5a1e4a429d -s ours am: 3dc07dc47a -s ours am: 8b6476206b -s ours am: 6aa01c0990 -s ours am: 8999e597aa -s ours

am skip reason: Merged-In I8e1f5a5af4d649f3b185e3ec52444c4d8646ac4e with SHA-1 48fde76f4a is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/platform/+/2775120

Change-Id: Icfb0ce179b70ff27e916c844d578bcb886833dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

34/64/arm/source-based/config.json

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"
+      ]
+    }
+  ]
+}

34/64/arm64/source-based/config.json

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"
+      ]
+    }
+  ]
+}

34/64/arm_arm64/source-based/config.json

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"
+      ]
+    }
+  ]
+}

34/64/x86/source-based/config.json

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"
+      ]
+    }
+  ]
+}

34/64/x86_64/source-based/config.json

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"
+      ]
+    }
+  ]
+}

34/64/x86_x86_64/source-based/config.json

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"
+      ]
+    }
+  ]
+}