commit 646e843e91aa4f24b135bbc1fd2f05e0095c2603
author Colin Cross <ccross@android.com> Thu Feb 20 15:05:02 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 20 15:05:02 2025 -0800
tree a848c88d729fc708a19f0bf8dffb146473090928
parent 8f8e31c86ae84397dbed6ed3c87567f3f24f5778
parent 8ff4af316f189fe278b8ef565591faef516918ac

Merge "Remove RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 523f55c..337545b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,10 +150,11 @@
     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",
             ],
         },
     },