Revert^2 "Define linker.recovery"
By removing the "recovery_available" property from "linker" module.
"recovery_available" property should be used to allow the reverse
dependencies recovery modules to depend on the module, not to
install the module to the recovery partition.
Test: m soong_generated_recovery_filesystem_test
Bug: 381888358
Change-Id: I9cae2fda8cb4da84eb6db2bb717d55420fb20062
diff --git a/linker/Android.bp b/linker/Android.bp
index 4863b92..395b195 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -350,11 +350,10 @@
// linker[_asan][64] binary
// ========================================================
-cc_binary {
- name: "linker",
+cc_defaults {
+ name: "linker_binary_defaults",
defaults: [
"linker_bin_template",
- "linux_bionic_supported",
"linker_version_script_overlay",
],
@@ -376,8 +375,6 @@
compile_multilib: "both",
- recovery_available: true,
- vendor_ramdisk_available: true,
apex_available: [
"//apex_available:platform",
"com.android.runtime",
@@ -403,6 +400,26 @@
afdo: true,
}
+cc_binary {
+ name: "linker",
+ defaults: [
+ "linux_bionic_supported",
+ "linker_binary_defaults",
+ ],
+
+ vendor_ramdisk_available: true,
+}
+
+cc_binary {
+ name: "linker.recovery",
+ defaults: [
+ "linker_binary_defaults",
+ ],
+
+ recovery: true,
+ stem: "linker",
+}
+
// ========================================================
// assorted modules
// ========================================================