From 890b4d755fe583760006121658667a534b4f73ed Mon Sep 17 00:00:00 2001
From: Rajesh Nyamagoud <nyamagoud@google.com>
Date: Sat, 13 Nov 2021 02:44:41 +0000
Subject: [PATCH] replaced android.se.omapi-V1-ndk_platform library with
 android.se.omapi-V1-ndk

Test: make vts
Bug: b/180639372
Change-Id: I34b3cd0bd6c92bfe2ee57b5dbda73adc3c4d116e
---
 omapi/aidl/Android.bp                                 | 3 +++
 omapi/aidl/vts/functional/AccessControlApp/Android.bp | 2 +-
 omapi/aidl/vts/functional/omapi/Android.bp            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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",