Disable hwasan in llvm-10.0. This is a workaround to stop the ui thread watchdog from timing out on cf_arm64. Bug: 193198227 Tested-by: Evgenii Stepanov <eugenis@google.com> Change-Id: Ia0c71b58578e7a39ea493c8df3d08abf5a3be456 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/56228 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Commit-Queue: Evgenii Stepanov <eugenis@google.com>
diff --git a/third_party/llvm-10.0/Android.bp b/third_party/llvm-10.0/Android.bp index e5d50a6..306285e 100644 --- a/third_party/llvm-10.0/Android.bp +++ b/third_party/llvm-10.0/Android.bp
@@ -1040,6 +1040,12 @@ "-Wno-unused-parameter", "-Wno-unused-variable", ], + + sanitize: { + // HWASan slows down LLVM JIT compilation more than usual. + // b/193198227 + hwaddress: false, + }, } cc_library_static {