2 files changed, 7 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 95d8c81c..82f6a7ca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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