diff options
| author | Xin Li <delphij@google.com> | 2017-12-06 11:51:53 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-12-06 14:24:47 -0800 |
| commit | 791f9897b6699efb63392781b21d9486ce2387fd (patch) | |
| tree | 17a9b951c163abe676c95d3cbe694721f35ea273 | |
| parent | 93264cbc8ca69346b3078abe5eb657e6169854b2 (diff) | |
| parent | 68e28a69538fcf6a73efa82331e1bcad5940f227 (diff) | |
| download | libopus-791f9897b6699efb63392781b21d9486ce2387fd.tar.gz | |
DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ib5b08032bb59b7014f8e929aa4017025339e1e0d
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | celt/x86/x86cpu.h | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,9 @@ cc_library_shared { name: "libopus", + vendor_available: true, + vndk: { + enabled: true, + }, export_include_dirs: ["include"], diff --git a/celt/x86/x86cpu.h b/celt/x86/x86cpu.h index 04fd48aa..1e2bf17b 100644 --- a/celt/x86/x86cpu.h +++ b/celt/x86/x86cpu.h @@ -82,7 +82,9 @@ int opus_select_arch(void); (_mm_cvtepi8_epi32(*(__m128i *)(x))) #endif -# if !defined(__OPTIMIZE__) +/* similar reasoning about the instruction sequence as in the 32-bit macro above, + */ +# if defined(__clang__) || !defined(__OPTIMIZE__) # define OP_CVTEPI16_EPI32_M64(x) \ (_mm_cvtepi16_epi32(_mm_loadl_epi64((__m128i *)(x)))) # else |