From 18be965c7e7d155930b182b41d8d1c1fb8405bf9 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 2 Mar 2020 10:24:23 -0500 Subject: [PATCH] Identity: Statically link additional libraries in VtsHalIdentityTargetTest. The problem was that VtsHalIdentityTargetTest was dynamically linking libraries that (currently) only are pulled in by the default IC HAL implementaiton. This caused linking problems when copying VtsHalIdentityTargetTest onto a device a running it. Fix this by only dynamically linking libbinder and libcrypto. Bug: 150475275 Test: VtsHalIdentityTargetTest runs on a device without Identity Credential. Merged-In: I4162cc81ade0373c31c96008f3a2bc95684fd2c2 Change-Id: I7a55a6e602b9902bd725190aa5631644f7639b95 --- identity/aidl/vts/Android.bp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp index 21ff440075..cecc814fdc 100644 --- a/identity/aidl/vts/Android.bp +++ b/identity/aidl/vts/Android.bp @@ -7,10 +7,11 @@ cc_test { srcs: ["VtsHalIdentityTargetTest.cpp"], shared_libs: [ "libbinder", - "libcppbor", - "android.hardware.identity-support-lib", + "libcrypto", ], static_libs: [ + "libcppbor", + "android.hardware.identity-support-lib", "android.hardware.identity-cpp", "android.hardware.keymaster-cpp", ],