Merge "Revert "Enable _FORTIFY_SOURCE=3 for Bionic"" into main
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
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
// ========================================================