Merge "Revert "Define linker.recovery"" into main am: 69358d7377 am: 4939b09fc1
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3395834
Change-Id: I444d5795e6fb5d297bbb3b9a20d9d19a14c91290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/linker/Android.bp b/linker/Android.bp
index 1d0e14d..4863b92 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -350,8 +350,8 @@
// linker[_asan][64] binary
// ========================================================
-cc_defaults {
- name: "linker_binary_defaults",
+cc_binary {
+ name: "linker",
defaults: [
"linker_bin_template",
"linux_bionic_supported",
@@ -376,6 +376,8 @@
compile_multilib: "both",
+ recovery_available: true,
+ vendor_ramdisk_available: true,
apex_available: [
"//apex_available:platform",
"com.android.runtime",
@@ -401,25 +403,6 @@
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
// ========================================================