diff --git a/omapi/aidl/Android.bp b/omapi/aidl/Android.bp
index d80317bb8c60e..2b81200f00797 100644
--- a/omapi/aidl/Android.bp
+++ b/omapi/aidl/Android.bp
@@ -28,5 +28,8 @@ aidl_interface {
         rust: {
             enabled: true,
         },
+        ndk: {
+            separate_platform_variant: false,
+        },
     },
 }
diff --git a/omapi/aidl/vts/functional/AccessControlApp/Android.bp b/omapi/aidl/vts/functional/AccessControlApp/Android.bp
index ed8be10230548..f03c3f6eb6477 100644
--- a/omapi/aidl/vts/functional/AccessControlApp/Android.bp
+++ b/omapi/aidl/vts/functional/AccessControlApp/Android.bp
@@ -38,7 +38,7 @@ cc_test {
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.se.omapi-V1-ndk_platform",
+        "android.se.omapi-V1-ndk",
     ],
     cflags: [
         "-O0",
diff --git a/omapi/aidl/vts/functional/omapi/Android.bp b/omapi/aidl/vts/functional/omapi/Android.bp
index 0f5d2fe83ecd3..c3ab8d13920ce 100644
--- a/omapi/aidl/vts/functional/omapi/Android.bp
+++ b/omapi/aidl/vts/functional/omapi/Android.bp
@@ -38,7 +38,7 @@ cc_test {
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.se.omapi-V1-ndk_platform",
+        "android.se.omapi-V1-ndk",
     ],
     cflags: [
         "-O0",