diff options
| author | 2021-11-23 05:29:52 +0000 | |
|---|---|---|
| committer | 2021-11-23 05:29:52 +0000 | |
| commit | 746c751732ec2ba8abd947f9df1e5e24321c76a6 (patch) | |
| tree | 8e1f280437fe2ba4cea3945a4702f450faeb62f4 | |
| parent | 4fb7fc548941a22a0208124309651d0db1515a89 (diff) | |
| parent | 8989606294d9a7551c403a8b44ad7f61b8e354e4 (diff) | |
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
| -rw-r--r-- | omapi/aidl/Android.bp | 3 | ||||
| -rw-r--r-- | omapi/aidl/vts/functional/AccessControlApp/Android.bp | 2 | ||||
| -rw-r--r-- | 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 d80317bb8c60..2b81200f0079 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 ed8be1023054..f03c3f6eb647 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 0f5d2fe83ecd..c3ab8d13920c 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", |