diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-09-07 19:44:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-07 19:44:59 +0000 |
| commit | 245ce73206dfb52cc8da7f1138f0520daea54b1c (patch) | |
| tree | 71d20d87f6b82890c1503ea80ea32a8d1b54bb20 /include/libyuv/rotate_row.h | |
| parent | 984e473b04c20de6b7323bbe6047d1d515588473 (diff) | |
| parent | f0da29480964d8f73d12d9c018e0cd42d73829d6 (diff) | |
| download | libyuv-245ce73206dfb52cc8da7f1138f0520daea54b1c.tar.gz | |
Merge changes from topic "upgrade-libyuv" into main am: f0da294809androidx-wear-wear-tooling-preview-releaseandroidx-versionedparcelable-releaseandroidx-core-performance-release
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/2740595
Change-Id: I89fc2eac352215f6975e2d530a664b2f1adca583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'include/libyuv/rotate_row.h')
| -rw-r--r-- | include/libyuv/rotate_row.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/libyuv/rotate_row.h b/include/libyuv/rotate_row.h index 2dd8c03d..3e6a2fef 100644 --- a/include/libyuv/rotate_row.h +++ b/include/libyuv/rotate_row.h @@ -28,7 +28,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif |