commit 76c144a81ece23fef09c02d18fdf95aca52c0bf9
author Andrew Chant <achant@google.com> Fri Feb 14 10:27:13 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 10:27:13 2025 -0800
tree 9ca57c1180a2c8dc0864afb53df89d8934c6ef3b
parent 85cd549ecc55f7540580c5a8818ec54f02df1857
parent fece008edd9888b4520bebe296de87e15580d054

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 6c40661..523f55c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,6 +147,16 @@
 // 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"],
 }