From dd26705c3e344239487999ec3e2030e76a01a188 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 18 Feb 2026 21:12:33 +0000
Subject: [PATCH 1/2] libavc: ignore BTI for now.

The assembler in this project needs updating, but we want to enable the
bti-report=error flag globally.

Change-Id: Ia67dd7bfc9adce5a434f45a783ffbc109dfb4dd4
---
 Android.bp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 16f518a..3cf2958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -288,7 +288,10 @@ cc_library_static {
 
 cc_library_static {
     name: "libavcdec",
-    defaults: ["libavc_dec_defaults"],
+    defaults: [
+        "libavc_dec_defaults",
+        "no_bti",
+    ],
 
     export_include_dirs: [
         "common",

From 81d765231f5e48043dcd1b4abc095cc89c525a3a Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 26 Feb 2026 20:10:54 +0000
Subject: [PATCH 2/2] Also ignore missing BTI for the examples, fuzzers, and
 tests.

Change-Id: Ic4e60685efde008d04e0c070d35bc207564c9fcb
---
 examples/Android.bp | 6 ++++++
 fuzzer/Android.bp   | 3 +++
 tests/Android.bp    | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/examples/Android.bp b/examples/Android.bp
index 0015273..5e65390 100644
--- a/examples/Android.bp
+++ b/examples/Android.bp
@@ -9,6 +9,9 @@ package {
 
 cc_defaults {
     name: "avcdec_defaults",
+    defaults: [
+        "no_bti",
+    ],
     gtest: false,
     host_supported: true,
     cflags: [
@@ -29,6 +32,9 @@ cc_defaults {
 
 cc_defaults {
     name: "avcenc_defaults",
+    defaults: [
+        "no_bti",
+    ],
     gtest: false,
     host_supported: true,
     cflags: [
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 5d3e63b..33562f2 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -9,6 +9,9 @@ package {
 
 cc_defaults {
     name: "libavc_fuzzer_defaults",
+    defaults: [
+        "no_bti",
+    ],
     host_supported: true,
     static_libs: ["liblog"],
     target: {
diff --git a/tests/Android.bp b/tests/Android.bp
index 89bb1e7..c56d3f1 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -25,6 +25,9 @@ package {
 
 cc_test {
     name: "AvcEncTest",
+    defaults: [
+        "no_bti",
+    ],
     gtest: true,
     test_suites: ["device-tests"],