diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-18 12:59:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-18 12:59:44 +0000 |
| commit | cb2ba40919f51f19f25cdff72a12bc9f229c96e3 (patch) | |
| tree | df06bde6b83e596b2884d85e2571c0848b2cd926 | |
| parent | a5ec53d68f74de295b27b23b7887b3f794d488cc (diff) | |
| parent | 95dbe442b2abb89017afd52c6e913fe9e7b200f1 (diff) | |
Merge "Specify version for aidl_interface explicitly"
| -rw-r--r-- | security/keymint/aidl/default/Android.bp | 6 | ||||
| -rw-r--r-- | security/keymint/aidl/vts/functional/Android.bp | 2 | ||||
| -rw-r--r-- | security/keymint/support/Android.bp | 2 | ||||
| -rw-r--r-- | security/secureclock/aidl/vts/functional/Android.bp | 4 | ||||
| -rw-r--r-- | security/sharedsecret/aidl/vts/functional/Android.bp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp index e9f3be0a69..e160548931 100644 --- a/security/keymint/aidl/default/Android.bp +++ b/security/keymint/aidl/default/Android.bp @@ -14,8 +14,8 @@ cc_binary { ], shared_libs: [ "android.hardware.security.keymint-V1-ndk_platform", - "android.hardware.security.sharedsecret-unstable-ndk_platform", - "android.hardware.security.secureclock-unstable-ndk_platform", + "android.hardware.security.sharedsecret-V1-ndk_platform", + "android.hardware.security.secureclock-V1-ndk_platform", "libbase", "libbinder_ndk", "libcppbor_external", @@ -39,7 +39,7 @@ cc_library { "libkeymint_remote_prov_support", ], shared_libs: [ - "android.hardware.security.keymint-unstable-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", "libbinder_ndk", "libcppbor_external", "libcppcose", diff --git a/security/keymint/aidl/vts/functional/Android.bp b/security/keymint/aidl/vts/functional/Android.bp index 7e78c45233..24fe61641c 100644 --- a/security/keymint/aidl/vts/functional/Android.bp +++ b/security/keymint/aidl/vts/functional/Android.bp @@ -84,7 +84,7 @@ cc_test { "libpuresoftkeymasterdevice", ], static_libs: [ - "android.hardware.security.keymint-unstable-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", "libcppcose", "libgmock_ndk", "libremote_provisioner", diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp index efdff2bdfc..02558745d5 100644 --- a/security/keymint/support/Android.bp +++ b/security/keymint/support/Android.bp @@ -71,6 +71,6 @@ cc_library { ], static_libs: [ // TODO(swillden): Remove keymint NDK - "android.hardware.security.keymint-unstable-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", ], } diff --git a/security/secureclock/aidl/vts/functional/Android.bp b/security/secureclock/aidl/vts/functional/Android.bp index 30244eb137..1619eab235 100644 --- a/security/secureclock/aidl/vts/functional/Android.bp +++ b/security/secureclock/aidl/vts/functional/Android.bp @@ -33,8 +33,8 @@ cc_test { "libkeymint", ], static_libs: [ - "android.hardware.security.keymint-unstable-ndk_platform", - "android.hardware.security.secureclock-unstable-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", + "android.hardware.security.secureclock-V1-ndk_platform", ], test_suites: [ "general-tests", diff --git a/security/sharedsecret/aidl/vts/functional/Android.bp b/security/sharedsecret/aidl/vts/functional/Android.bp index 56ab317cf2..76bf7ff762 100644 --- a/security/sharedsecret/aidl/vts/functional/Android.bp +++ b/security/sharedsecret/aidl/vts/functional/Android.bp @@ -33,8 +33,8 @@ cc_test { "libkeymint", ], static_libs: [ - "android.hardware.security.keymint-unstable-ndk_platform", - "android.hardware.security.sharedsecret-unstable-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", + "android.hardware.security.sharedsecret-V1-ndk_platform", ], test_suites: [ "general-tests", |