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", 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"],