Merge "Revert^2 "cc_baremetal_defaults: Disable SVE"" into main

1 files changed, 10 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 6c4066160..523f55c4b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,6 +147,16 @@ all_apex_contributions {
 // Framework guests.
 cc_defaults {
     name: "cc_baremetal_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",
+            ],
+        },
+    },
     defaults_visibility: ["//visibility:public"],
 }