Merge changes from topic "OMAPI_VNTF" am: f7a480d824 am: 8989606294

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891499 Change-Id: If8c9e5560f43a511567b60046165ca7fbb19f8af
2021-11-23 05:29:52 +00:00
parent 4fb7fc5489 8989606294
commit 746c751732
3 changed files with 5 additions and 2 deletions
--- a/omapi/aidl/Android.bp
+++ b/omapi/aidl/Android.bp
@@ -28,5 +28,8 @@ aidl_interface {
        rust: {
            enabled: true,
        },
+        ndk: {
+            separate_platform_variant: false,
+        },
    },
 }
--- 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",
--- 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",