commit 8f8f4041813f4a9174326efff36456f8fe9e7c21
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Dec 07 01:24:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 07 01:24:11 2024 +0000
tree d1a6a4bfbc36c85c3f66eeeac149ded32164b120
parent cf3099a2ef83c16bf26a3bea55938c29c82e73d5
parent eaa602b4c1059ea3340554c15b099c5c946d9a24

Merge "Define linker.recovery" into main am: eaa602b4c1

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3391032

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

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index 4863b92..1d0e14d 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -350,8 +350,8 @@
 // linker[_asan][64] binary
 // ========================================================
 
-cc_binary {
-    name: "linker",
+cc_defaults {
+    name: "linker_binary_defaults",
     defaults: [
         "linker_bin_template",
         "linux_bionic_supported",
@@ -376,8 +376,6 @@
 
     compile_multilib: "both",
 
-    recovery_available: true,
-    vendor_ramdisk_available: true,
     apex_available: [
         "//apex_available:platform",
         "com.android.runtime",
@@ -403,6 +401,25 @@
     afdo: true,
 }
 
+cc_binary {
+    name: "linker",
+    defaults: [
+        "linker_binary_defaults",
+    ],
+
+    vendor_ramdisk_available: true,
+}
+
+cc_binary {
+    name: "linker.recovery",
+    defaults: [
+        "linker_binary_defaults",
+    ],
+
+    recovery: true,
+    stem: "linker",
+}
+
 // ========================================================
 // assorted modules
 // ========================================================