summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornxf31698 <suryaprakash.konduru@nxp.com>2022-11-22 19:32:07 +0530
committerTodd Frederick <tfred@google.com>2023-03-11 13:57:02 +0000
commitdbe876048b34a52a2f0d6f3808660bc184ff6a7a (patch)
tree65fd61376979845a8cf4e9e7300a7f372457d493
parentb5ab4a9585ccb57c6a98520a61006e204db6b6fa (diff)
downloadkeymint-dbe876048b34a52a2f0d6f3808660bc184ff6a7a.tar.gz
Fix for the compilation issue with latest AOSP Manifest
- Since the "keymint_use_latest_hal_aidl_ndk_shared" is ponting to "android.hardware.security.keymint-V3-ndk". It is failing because new KeyMint V3 is not implemented. (cherry picked from commit bc02d50482471419db40e73f88948536437ec8cf) Bug: 270239534 Test: m (cherry picked from commit c8ec09b0cec0aa9e9ad7b71b5964694a268d8469) Change-Id: I53bb0b2539d7ef13178960f69fcc45a61fbbd681 Signed-off-by: Todd Frederick <tfred@google.com>
-rw-r--r--Android.bp10
1 files changed, 3 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 377b17b..3584fea 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,6 @@ cc_library {
name: "libjc_keymint",
defaults: [
"keymaster_defaults",
- "keymint_use_latest_hal_aidl_ndk_shared",
],
srcs: [
"CborConverter.cpp",
@@ -64,6 +63,7 @@ cc_library {
"libcutils",
"libjc_keymint_transport",
"libbinder_ndk",
+ "android.hardware.security.keymint-V2-ndk",
],
export_include_dirs: [
".",
@@ -78,9 +78,6 @@ cc_library {
cc_library {
name: "libjc_keymint_transport",
- defaults: [
- "keymint_use_latest_hal_aidl_ndk_shared",
- ],
vendor_available: true,
srcs: [
"transport/*.cpp",
@@ -110,14 +107,12 @@ cc_library {
"libhardware",
"libhidlbase",
"libbinder_ndk",
+ "android.hardware.security.keymint-V2-ndk",
],
}
cc_binary {
name: "android.hardware.security.keymint-service.strongbox",
- defaults: [
- "keymint_use_latest_hal_aidl_ndk_shared",
- ],
relative_install_path: "hw",
init_rc: ["android.hardware.security.keymint-service.strongbox.rc"],
vintf_fragments: [
@@ -144,6 +139,7 @@ cc_binary {
"liblog",
"libutils",
"libhidlbase",
+ "android.hardware.security.keymint-V2-ndk",
],
srcs: [
"service.cpp",