From b9c1bf8bbfebdeb6d346edea35be71d7c778893f Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 18 Feb 2026 21:13:38 +0000
Subject: [PATCH 1/3] libhevc: ignore BTI for now.

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

Change-Id: Id7d8e3c52c74f007c73729bac35b76c23cd02956
---
 Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.bp b/Android.bp
index 731831c..3dd3d0c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,7 @@ cc_library_headers {
 
 cc_library_static {
     name: "libhevcdec",
+    defaults: ["no_bti"],
     vendor_available: true,
     host_supported: true,
 
@@ -441,6 +442,7 @@ cc_test {
 
 cc_library_static {
     name: "libhevcenc",
+    defaults: ["no_bti"],
     vendor_available: true,
     host_supported: true,
     cflags: [

From 1e08a022f7cb864a112557d5132b54ad827f704e Mon Sep 17 00:00:00 2001
From: Ananya Sharma <ananyashar@google.com>
Date: Mon, 9 Mar 2026 08:47:00 +0000
Subject: [PATCH 2/3] Fix CL for failing targets in git_main-throttled-haiku

This change adds the 'no_bti' default to hevc_dec_fuzzer and hevc_enc_fuzzer as they statically link against libraries lacking BTI support. This is done to fix the linker errors raised in haiku_fuzz_shiba-trunk_staging-userdebug and haiku_fuzzcoverage_shiba-trunk_staging-userdebug targets.

Bug: 491119982

Flag: EXEMPT BUGFIX

Test: CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS='*' m haiku dist && m haiku dist

Change-Id: I3f569311b17667f2f4dd57e846d13e50ee5dfbe9
---
 fuzzer/Android.bp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 17bcca0..05ce8db 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -9,6 +9,10 @@ package {
 
 cc_fuzz {
     name: "hevc_dec_fuzzer",
+    //TODO: b/485868924
+    defaults: [
+        "no_bti",
+    ],
     host_supported: true,
     srcs: [
         "hevc_dec_fuzzer.cpp",
@@ -41,6 +45,10 @@ cc_fuzz {
 
 cc_fuzz {
     name: "hevc_enc_fuzzer",
+    //TODO: b/485868924
+    defaults: [
+        "no_bti",
+    ],
     host_supported: true,
     srcs: [
         "hevc_enc_fuzzer.cpp",

From cbd0e91d89e9e2b17a3655625923af590cd7c41c Mon Sep 17 00:00:00 2001
From: Ethan Cheng <yycheng@google.com>
Date: Fri, 20 Mar 2026 16:04:54 +0800
Subject: [PATCH 3/3] Redefine hevc examples test modules as cc_binary

This change redefines the `cc_test` modules within the test
directory as `cc_binary` modules.

Previously, these `cc_test` modules were effectively acting as wrappers
around executable binaries, solely for the purpose of generating test
executables. This approach did not allow for the direct installation of
these executables on devices.

Changing these modules to `cc_binary` allows the resulting executables
are produced as standalone binaries, enabling their deployment and
execution on test devices.

Bug: 33315805
Test: 1. m hevcdec
      2. m hevcenc
      3. verifying both binaries exists and can be called
Flag: EXEMPT TEST_ONLY
Change-Id: I70945c15895e2e18eb3fa0d5c109a3d0fdaf7f05
---
 Android.bp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index 3dd3d0c..b5a0580 100644
--- a/Android.bp
+++ b/Android.bp
@@ -419,7 +419,7 @@ cc_library_static {
     min_sdk_version: "29",
 }
 
-cc_test {
+cc_binary {
     name: "hevcdec",
     host_supported: true,
     cflags: [
@@ -430,7 +430,6 @@ cc_test {
         "-Wall",
         "-Werror",
     ],
-    gtest: false,
     srcs: ["test/decoder/main.c"],
     static_libs: ["libhevcdec"],
     target: {
@@ -807,7 +806,7 @@ cc_library_static {
     min_sdk_version: "29",
 }
 
-cc_test {
+cc_binary {
     name: "hevcenc",
     host_supported: true,
     cflags: [
@@ -816,7 +815,6 @@ cc_test {
         "-Wall",
         "-Werror",
     ],
-    gtest: false,
     srcs: ["test/encoder/main.c"],
     static_libs: ["libhevcenc"],
     sanitize: {