Use baseline instruction set on baremetal targets.

Instead of trying to individually disable every instruction
set extension that might not be supported in bare-metal
environments, disable them all.

Bug: 364383722
Test: presubmit
Change-Id: I881b14d28dad0372bd118731b03ead15d19dd669

1 files changed, 5 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 523f55c4b..337545bce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,10 +150,11 @@ cc_defaults {
     arch: {
         arm64: {
             cflags: [
-                // Prevent the compiler from optimizing code using SVE, as the
-                // baremetal environment might not have configured the hardware.
-                "-Xclang -target-feature",
-                "-Xclang -sve",
+                // Override the global -march= flag (as set by TARGET_ARCH_VARIANT)
+                // and explicitly use the baseline architecture (ARMv8-A is the first
+                // version with 64-bit support) to avoid emitting potentially
+                // unsupported instructions.
+                "-march=armv8-a",
             ],
         },
     },