commit 780f8c860d4afd594da92ebec845ab8f03305f7a
author David Zeuthen <zeuthen@google.com> Thu Jun 18 09:44:51 2020 -0400
committer David Zeuthen <zeuthen@google.com> Thu Jun 18 09:44:51 2020 -0400
tree 8f48ae3aa94276ad224e2402f8801e830392122e
parent 4e27e0f5a2b7fe94e9deeb8fe01031be5b2a5703

Identity: More static linking of VTS test binary.

The VTS test was dynamically linking some libraries not normally
present on an Android system. Statically link these libraries instead.

Bug: 158150767
Test: atest VtsHalIdentityTargetTest
Change-Id: Ib93620c36b0ff7f5c9f239ff8861a11196605881

identity/aidl/vts/Android.bp

diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index cd6f9b0..c1f44e7 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -14,19 +14,19 @@
         "ReaderAuthTests.cpp",
     ],
     shared_libs: [
-        "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
-        "android.hardware.keymaster-ndk_platform",
     ],
     static_libs: [
         "libcppbor",
         "libkeymaster_portable",
         "libsoft_attestation_cert",
         "libpuresoftkeymasterdevice",
+        "android.hardware.keymaster@4.0",
         "android.hardware.identity-support-lib",
         "android.hardware.identity-cpp",
         "android.hardware.keymaster-cpp",
+        "android.hardware.keymaster-ndk_platform",
     ],
     test_suites: [
         "general-tests",