commit 1674c1354e4c191b9da955cd91f028abee359ae3
author Jeongik Cha <jeongik@google.com> Tue Jan 26 22:34:55 2021 +0900
committer Jeongik Cha <jeongik@google.com> Thu Jan 28 15:14:10 2021 +0000
tree d6533354644a05e0e291debee35735b6d262bec5
parent df543ea006c18e133827cef0a2fb1bc6de0fabb3

Specify version for aidl_interface explicitly

Bug: 150578172
Test: m
Change-Id: Ie7605c203c0f0eaf2c40f1e64ea45634b3aa54a5
Merged-In: I141de8ed6958fe42f727a0fa41473de4c1fb38de

identity/aidl/default/Android.bp

diff --git a/identity/aidl/default/Android.bp b/identity/aidl/default/Android.bp
index 8744648..9659f57 100644
--- a/identity/aidl/default/Android.bp
+++ b/identity/aidl/default/Android.bp
@@ -29,8 +29,8 @@
         "libsoft_attestation_cert",
         "libpuresoftkeymasterdevice",
         "android.hardware.identity-support-lib",
-        "android.hardware.identity-unstable-ndk_platform",
-        "android.hardware.keymaster-unstable-ndk_platform",
+        "android.hardware.identity-V3-ndk_platform",
+        "android.hardware.keymaster-V3-ndk_platform",
     ],
 }
 
@@ -89,8 +89,8 @@
         "libsoft_attestation_cert",
         "libpuresoftkeymasterdevice",
         "android.hardware.identity-support-lib",
-        "android.hardware.identity-unstable-ndk_platform",
-        "android.hardware.keymaster-unstable-ndk_platform",
+        "android.hardware.identity-V3-ndk_platform",
+        "android.hardware.keymaster-V3-ndk_platform",
         "android.hardware.identity-libeic-hal-common",
         "android.hardware.identity-libeic-library",
     ],

identity/aidl/vts/Android.bp

diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index f1b1bcf..f487a64 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -30,9 +30,9 @@
         "libpuresoftkeymasterdevice",
         "android.hardware.keymaster@4.0",
         "android.hardware.identity-support-lib",
-        "android.hardware.identity-unstable-cpp",
-        "android.hardware.keymaster-unstable-cpp",
-        "android.hardware.keymaster-unstable-ndk_platform",
+        "android.hardware.identity-V3-cpp",
+        "android.hardware.keymaster-V3-cpp",
+        "android.hardware.keymaster-V3-ndk_platform",
         "libkeymaster4support",
         "libkeymaster4_1support",
     ],